From e8f6c13ea703120be060c767cee9218f6d6b83fa Mon Sep 17 00:00:00 2001 From: Hao Zhou Date: Tue, 31 Aug 2021 13:22:45 -0700 Subject: [PATCH] Ran generate-cni-yaml to update calico manifests in config after updating charts --- config/master/calico-crs.yaml | 2 ++ config/master/calico-operator.yaml | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/master/calico-crs.yaml b/config/master/calico-crs.yaml index 9bd0b46aa8..8a22249781 100644 --- a/config/master/calico-crs.yaml +++ b/config/master/calico-crs.yaml @@ -6,6 +6,8 @@ apiVersion: operator.tigera.io/v1 kind: Installation metadata: name: default + annotations: + "helm.sh/hook": post-install spec: # Configures Calico policy configured to work with AmazonVPC CNI networking. cni: diff --git a/config/master/calico-operator.yaml b/config/master/calico-operator.yaml index be081ade18..e44ed5e95d 100644 --- a/config/master/calico-operator.yaml +++ b/config/master/calico-operator.yaml @@ -5005,9 +5005,10 @@ rules: resources: - felixconfigurations verbs: + - create - patch - list - - create + - get - watch - apiGroups: - crd.projectcalico.org @@ -5149,7 +5150,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: tigera-operator - image: quay.io/tigera/operator:v1.21.0 + image: quay.io/tigera/operator:v1.20.1 imagePullPolicy: IfNotPresent command: - operator @@ -5167,7 +5168,7 @@ spec: - name: OPERATOR_NAME value: "tigera-operator" - name: TIGERA_OPERATOR_INIT_IMAGE_VERSION - value: v1.21.0 + value: v1.20.1 envFrom: - configMapRef: name: kubernetes-services-endpoint