Aamitra/capi templates overrides fix (#51) (#52)

* Update CAPI to module latest main * Fix module operator apis in templates
verrazzano · Jun 14, 2023 · 7672b33 · 7672b33
1 parent 5958aaf
commit 7672b33
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 56 deletions.
diff --git a/examples/module-operator/cluster-template-existingvcnwithaddons-skipinstall.yaml b/examples/module-operator/cluster-template-existingvcnwithaddons-skipinstall.yaml
@@ -388,20 +388,19 @@ data:
     spec:
       moduleName: calico
       targetNamespace: default
-      overrides:
-        - values:
-            tigeraOperator:
-              version: ${TIGERA_TAG=v1.29.0}
-            installation:
-              cni:
-                type: Calico
-              calicoNetwork:
-                bgp: Disabled
-                ipPools:
-                  - cidr: ${POD_CIDR=192.168.0.0/16}
-                    encapsulation: VXLAN
-              registry: ${OCNE_IMAGE_REPOSITORY=container-registry.oracle.com}
-              imagePath: ${OCNE_IMAGE_PATH=olcne}
+      values:
+        tigeraOperator:
+          version: ${TIGERA_TAG=v1.29.0}
+        installation:
+          cni:
+            type: Calico
+          calicoNetwork:
+            bgp: Disabled
+            ipPools:
+              - cidr: ${POD_CIDR=192.168.0.0/16}
+                encapsulation: VXLAN
+          registry: ${OCNE_IMAGE_REPOSITORY=container-registry.oracle.com}
+          imagePath: ${OCNE_IMAGE_PATH=olcne}
 kind: ConfigMap
 metadata:
   annotations:

diff --git a/examples/module-operator/cluster-template-existingvcnwithaddons.yaml b/examples/module-operator/cluster-template-existingvcnwithaddons.yaml
@@ -382,20 +382,19 @@ data:
     spec:
       moduleName: calico
       targetNamespace: default
-      overrides:
-        - values:
-            tigeraOperator:
-              version: ${TIGERA_TAG=v1.29.0}
-            installation:
-              cni:
-                type: Calico
-              calicoNetwork:
-                bgp: Disabled
-                ipPools:
-                  - cidr: ${POD_CIDR=192.168.0.0/16}
-                    encapsulation: VXLAN
-              registry: ${OCNE_IMAGE_REPOSITORY=container-registry.oracle.com}
-              imagePath: ${OCNE_IMAGE_PATH=olcne}
+      values:
+        tigeraOperator:
+          version: ${TIGERA_TAG=v1.29.0}
+        installation:
+          cni:
+            type: Calico
+          calicoNetwork:
+            bgp: Disabled
+            ipPools:
+              - cidr: ${POD_CIDR=192.168.0.0/16}
+                encapsulation: VXLAN
+          registry: ${OCNE_IMAGE_REPOSITORY=container-registry.oracle.com}
+          imagePath: ${OCNE_IMAGE_PATH=olcne}
 kind: ConfigMap
 metadata:
   annotations:

diff --git a/examples/module-operator/cluster-template-existingvcnwithaddonsandproxy-skipinstall.yaml b/examples/module-operator/cluster-template-existingvcnwithaddonsandproxy-skipinstall.yaml
@@ -396,20 +396,19 @@ data:
     spec:
       moduleName: calico
       targetNamespace: default
-      overrides:
-        - values:
-            tigeraOperator:
-              version: ${TIGERA_TAG=v1.29.0}
-            installation:
-              cni:
-                type: Calico
-              calicoNetwork:
-                bgp: Disabled
-                ipPools:
-                  - cidr: ${POD_CIDR=192.168.0.0/16}
-                    encapsulation: VXLAN
-              registry: ${OCNE_IMAGE_REPOSITORY=container-registry.oracle.com}
-              imagePath: ${OCNE_IMAGE_PATH=olcne}
+      values:
+        tigeraOperator:
+          version: ${TIGERA_TAG=v1.29.0}
+        installation:
+          cni:
+            type: Calico
+          calicoNetwork:
+            bgp: Disabled
+            ipPools:
+              - cidr: ${POD_CIDR=192.168.0.0/16}
+                encapsulation: VXLAN
+          registry: ${OCNE_IMAGE_REPOSITORY=container-registry.oracle.com}
+          imagePath: ${OCNE_IMAGE_PATH=olcne}
 kind: ConfigMap
 metadata:
   annotations:

diff --git a/examples/module-operator/cluster-template-existingvcnwithaddonsandproxy.yaml b/examples/module-operator/cluster-template-existingvcnwithaddonsandproxy.yaml
@@ -392,20 +392,19 @@ data:
     spec:
       moduleName: calico
       targetNamespace: default
-      overrides:
-        - values:
-            tigeraOperator:
-              version: ${TIGERA_TAG=v1.29.0}
-            installation:
-              cni:
-                type: Calico
-              calicoNetwork:
-                bgp: Disabled
-                ipPools:
-                  - cidr: ${POD_CIDR=192.168.0.0/16}
-                    encapsulation: VXLAN
-              registry: ${OCNE_IMAGE_REPOSITORY=container-registry.oracle.com}
-              imagePath: ${OCNE_IMAGE_PATH=olcne}
+      values:
+        tigeraOperator:
+          version: ${TIGERA_TAG=v1.29.0}
+        installation:
+          cni:
+            type: Calico
+          calicoNetwork:
+            bgp: Disabled
+            ipPools:
+              - cidr: ${POD_CIDR=192.168.0.0/16}
+                encapsulation: VXLAN
+          registry: ${OCNE_IMAGE_REPOSITORY=container-registry.oracle.com}
+          imagePath: ${OCNE_IMAGE_PATH=olcne}
 kind: ConfigMap
 metadata:
   annotations: