Skip to content

Commit bba3608

Browse files
committed
fix(charts): fix clusterrole
1 parent 59a8362 commit bba3608

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

charts/controller/templates/controller-clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ rules:
5353
- apiGroups: ["extensions"]
5454
resources: ["ingresses"]
5555
verbs: ["get", "list", "watch", "create", "update", "delete"]
56-
- apiGroups: ["certmanager.k8s.io"]
56+
- apiGroups: ["cert-manager.io"]
5757
resources: ["certificates", "issuers"]
5858
verbs: ["get", "list", "watch", "create", "update", "delete"]
5959
- apiGroups: ["networking.k8s.io"]

rootfs/Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN mkdir -p /run/postgresql $PGDATA \
2727
&& apk add --update --virtual .controller-rundeps \
2828
$runDeps \
2929
git \
30-
hg \
30+
mercurial \
3131
ca-certificates \
3232
su-exec \
3333
bash \

rootfs/scheduler/resources/pod.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -538,12 +538,11 @@ def events(self, pod):
538538
}
539539
events = self.ns.events(
540540
pod['metadata']['namespace'], fields=fields).json()['items']
541-
if events:
542-
events = list(filter(lambda x: x is not None, events))
543-
else:
541+
if not events:
544542
events = []
545543
# make sure that events are sorted
546-
events.sort(key=lambda x: x['lastTimestamp'])
544+
events.sort(
545+
key=lambda x: x['lastTimestamp'] if x['lastTimestamp'] else -1)
547546
return events
548547

549548
def _handle_pod_errors(self, pod, reason, message):

0 commit comments

Comments
 (0)