Make operator init container use k8s-svc-configmap if present.

projectcalico · Jan 10, 2025 · cdc1e4d · cdc1e4d
1 parent c9931c1
commit cdc1e4d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/charts/tigera-operator/templates/tigera-operator/02-tigera-operator.yaml b/charts/tigera-operator/templates/tigera-operator/02-tigera-operator.yaml
@@ -98,12 +98,20 @@ spec:
             - operator
           args:
             - -bootstrap-crds
+          envFrom:
+            - configMapRef:
+                name: kubernetes-services-endpoint
+                optional: true
         # Install any v3 API resources provided in the calico-resources ConfigMap.
         - name: create-initial-resources
           image: {{.Values.calicoctl.image}}:{{.Values.calicoctl.tag}}
           env:
             - name: DATASTORE_TYPE
               value: kubernetes
+          envFrom:
+            - configMapRef:
+                name: kubernetes-services-endpoint
+                optional: true
           command:
             - calicoctl
           args:

diff --git a/manifests/ocp/02-tigera-operator.yaml b/manifests/ocp/02-tigera-operator.yaml