Merge pull request openstack-k8s-operators#298 from dprince/dropConta…

…inerImages Drop containerImages from samples
ASBishop · May 9, 2023 · 4dd4d41 · 4dd4d41
2 parents 61daa4c + e7c1cb5
commit 4dd4d41
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 87 deletions.
diff --git a/config/samples/core_v1beta1_openstackcontrolplane.yaml b/config/samples/core_v1beta1_openstackcontrolplane.yaml
@@ -46,7 +46,6 @@ spec:
   placement:
     template:
       databaseInstance: openstack
-      containerImage: quay.io/tripleozedcentos9/openstack-placement-api:current-tripleo
       secret: osp-secret
   glance:
     template:
@@ -70,42 +69,33 @@ spec:
     template:
       manilaAPI:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-manila-api:current-tripleo
       manilaScheduler:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-manila-scheduler:current-tripleo
       manilaShares:
         share1:
-          containerImage: quay.io/tripleozedcentos9/openstack-manila-share:current-tripleo
           replicas: 1
   ovn:
     template:
       ovnDBCluster:
         ovndbcluster-nb:
           replicas: 1
-          containerImage: quay.io/tripleozedcentos9/openstack-ovn-nb-db-server:current-tripleo
           dbType: NB
           storageRequest: 10G
         ovndbcluster-sb:
           replicas: 1
-          containerImage: quay.io/tripleozedcentos9/openstack-ovn-sb-db-server:current-tripleo
           dbType: SB
           storageRequest: 10G
       ovnNorthd:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ovn-northd:current-tripleo
   ovs:
     template:
-      ovsContainerImage: "quay.io/skaplons/ovs:latest"
-      ovnContainerImage: "quay.io/tripleozedcentos9/openstack-ovn-controller:current-tripleo"
       external-ids:
         system-id: "random"
         ovn-bridge: "br-int"
         ovn-encap-type: "geneve"
   neutron:
     template:
       databaseInstance: openstack
-      containerImage: quay.io/tripleozedcentos9/openstack-neutron-server:current-tripleo
       secret: osp-secret
   horizon:
     template:
@@ -119,15 +109,10 @@ spec:
       databaseInstance: openstack
       ironicAPI:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-api:current-tripleo
       ironicConductors:
       - replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-conductor:current-tripleo
-        pxeContainerImage: quay.io/tripleozedcentos9/openstack-ironic-pxe:current-tripleo
         storageRequest: 10G
         storageClass: local-storage
       ironicInspector:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-inspector:current-tripleo
-        pxeContainerImage: quay.io/tripleozedcentos9/openstack-ironic-pxe:current-tripleo
       secret: osp-secret
diff --git a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml
@@ -28,7 +28,6 @@ spec:
   placement:
     template:
       databaseInstance: openstack
-      containerImage: quay.io/tripleozedcentos9/openstack-placement-api:current-tripleo
       secret: osp-secret
   glance:
     template:
@@ -53,29 +52,23 @@ spec:
       ovnDBCluster:
         ovndbcluster-nb:
           replicas: 1
-          containerImage: quay.io/tripleozedcentos9/openstack-ovn-nb-db-server:current-tripleo
           dbType: NB
           storageRequest: 10G
         ovndbcluster-sb:
           replicas: 1
-          containerImage: quay.io/tripleozedcentos9/openstack-ovn-sb-db-server:current-tripleo
           dbType: SB
           storageRequest: 10G
       ovnNorthd:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ovn-northd:current-tripleo
   ovs:
     template:
-      ovsContainerImage: "quay.io/skaplons/ovs:latest"
-      ovnContainerImage: "quay.io/tripleozedcentos9/openstack-ovn-controller:current-tripleo"
       external-ids:
         system-id: "random"
         ovn-bridge: "br-int"
         ovn-encap-type: "geneve"
   neutron:
     template:
       databaseInstance: openstack
-      containerImage: quay.io/tripleozedcentos9/openstack-neutron-server:current-tripleo
       secret: osp-secret
   nova:
     template:
@@ -104,14 +97,9 @@ spec:
       databaseInstance: openstack
       ironicAPI:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-api:current-tripleo
       ironicConductors:
       - replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-conductor:current-tripleo
-        pxeContainerImage: quay.io/tripleozedcentos9/openstack-ironic-pxe:current-tripleo
         storageRequest: 10G
       ironicInspector:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-inspector:current-tripleo
-        pxeContainerImage: quay.io/tripleozedcentos9/openstack-ironic-pxe:current-tripleo
       secret: osp-secret
diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml
@@ -47,7 +47,6 @@ spec:
   placement:
     template:
       databaseInstance: openstack
-      containerImage: quay.io/tripleozedcentos9/openstack-placement-api:current-tripleo
       secret: osp-secret
   glance:
     template:
@@ -71,42 +70,33 @@ spec:
     template:
       manilaAPI:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-manila-api:current-tripleo
       manilaScheduler:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-manila-scheduler:current-tripleo
       manilaShares:
         share1:
-          containerImage: quay.io/tripleozedcentos9/openstack-manila-share:current-tripleo
           replicas: 1
   ovn:
     template:
       ovnDBCluster:
         ovndbcluster-nb:
           replicas: 1
-          containerImage: quay.io/tripleozedcentos9/openstack-ovn-nb-db-server:current-tripleo
           dbType: NB
           storageRequest: 10G
         ovndbcluster-sb:
           replicas: 1
-          containerImage: quay.io/tripleozedcentos9/openstack-ovn-sb-db-server:current-tripleo
           dbType: SB
           storageRequest: 10G
       ovnNorthd:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ovn-northd:current-tripleo
   ovs:
     template:
-      ovsContainerImage: "quay.io/skaplons/ovs:latest"
-      ovnContainerImage: "quay.io/tripleozedcentos9/openstack-ovn-controller:current-tripleo"
       external-ids:
         system-id: "random"
         ovn-bridge: "br-int"
         ovn-encap-type: "geneve"
   neutron:
     template:
       databaseInstance: openstack
-      containerImage: quay.io/tripleozedcentos9/openstack-neutron-server:current-tripleo
       secret: osp-secret
   horizon:
     template:
@@ -120,15 +110,10 @@ spec:
       databaseInstance: openstack
       ironicAPI:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-api:current-tripleo
       ironicConductors:
       - replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-conductor:current-tripleo
-        pxeContainerImage: quay.io/tripleozedcentos9/openstack-ironic-pxe:current-tripleo
         storageRequest: 10G
         storageClass: local-storage
       ironicInspector:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-inspector:current-tripleo
-        pxeContainerImage: quay.io/tripleozedcentos9/openstack-ironic-pxe:current-tripleo
       secret: osp-secret
diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml
@@ -47,7 +47,6 @@ spec:
   placement:
     template:
       databaseInstance: openstack
-      containerImage: quay.io/tripleozedcentos9/openstack-placement-api:current-tripleo
       secret: osp-secret
   glance:
     template:
@@ -71,42 +70,33 @@ spec:
     template:
       manilaAPI:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-manila-api:current-tripleo
       manilaScheduler:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-manila-scheduler:current-tripleo
       manilaShares:
         share1:
-          containerImage: quay.io/tripleozedcentos9/openstack-manila-share:current-tripleo
           replicas: 1
   ovn:
     template:
       ovnDBCluster:
         ovndbcluster-nb:
           replicas: 1
-          containerImage: quay.io/tripleozedcentos9/openstack-ovn-nb-db-server:current-tripleo
           dbType: NB
           storageRequest: 10G
         ovndbcluster-sb:
           replicas: 1
-          containerImage: quay.io/tripleozedcentos9/openstack-ovn-sb-db-server:current-tripleo
           dbType: SB
           storageRequest: 10G
       ovnNorthd:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ovn-northd:current-tripleo
   ovs:
     template:
-      ovsContainerImage: "quay.io/skaplons/ovs:latest"
-      ovnContainerImage: "quay.io/tripleozedcentos9/openstack-ovn-controller:current-tripleo"
       external-ids:
         system-id: "random"
         ovn-bridge: "br-int"
         ovn-encap-type: "geneve"
   neutron:
     template:
       databaseInstance: openstack
-      containerImage: quay.io/tripleozedcentos9/openstack-neutron-server:current-tripleo
       secret: osp-secret
   horizon:
     template:
@@ -120,15 +110,10 @@ spec:
       databaseInstance: openstack
       ironicAPI:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-api:current-tripleo
       ironicConductors:
       - replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-conductor:current-tripleo
-        pxeContainerImage: quay.io/tripleozedcentos9/openstack-ironic-pxe:current-tripleo
         storageRequest: 10G
         storageClass: local-storage
       ironicInspector:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-inspector:current-tripleo
-        pxeContainerImage: quay.io/tripleozedcentos9/openstack-ironic-pxe:current-tripleo
       secret: osp-secret
diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml
@@ -60,7 +60,6 @@ spec:
   neutron:
     template:
       databaseInstance: openstack
-      containerImage: quay.io/tripleozedcentos9/openstack-neutron-server:current-tripleo
       secret: osp-secret
       externalEndpoints:
       - endpoint: internal
@@ -92,7 +91,6 @@ spec:
     template:
       manilaAPI:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-manila-api:current-tripleo
         externalEndpoints:
         - endpoint: internal
           ipAddressPool: internalapi
@@ -102,43 +100,35 @@ spec:
         - internalapi
       manilaScheduler:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-manila-scheduler:current-tripleo
         networkAttachments:
         - internalapi
       manilaShares:
         share1:
-          containerImage: quay.io/tripleozedcentos9/openstack-manila-share:current-tripleo
           replicas: 1
           networkAttachments:
           - internalapi
   ovn:
     template:
       ovnDBCluster:
         ovndbcluster-nb:
-          containerImage: quay.io/tripleozedcentos9/openstack-ovn-nb-db-server:current-tripleo
           dbType: NB
           storageRequest: 10G
           networkAttachment: internalapi
         ovndbcluster-sb:
-          containerImage: quay.io/tripleozedcentos9/openstack-ovn-sb-db-server:current-tripleo
           dbType: SB
           storageRequest: 10G
           networkAttachment: internalapi
       ovnNorthd:
-        containerImage: quay.io/tripleozedcentos9/openstack-ovn-northd:current-tripleo
         networkAttachment: internalapi
   ovs:
     template:
-      ovsContainerImage: "quay.io/skaplons/ovs:latest"
-      ovnContainerImage: "quay.io/tripleozedcentos9/openstack-ovn-controller:current-tripleo"
       external-ids:
         system-id: "random"
         ovn-bridge: "br-int"
         ovn-encap-type: "geneve"
       networkAttachment: tenant
   placement:
     template:
-      containerImage: quay.io/tripleozedcentos9/openstack-placement-api:current-tripleo
       databaseInstance: openstack
       secret: osp-secret
       externalEndpoints:
@@ -166,14 +156,9 @@ spec:
       databaseInstance: openstack
       ironicAPI:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-api:current-tripleo
       ironicConductors:
       - replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-conductor:current-tripleo
-        pxeContainerImage: quay.io/tripleozedcentos9/openstack-ironic-pxe:current-tripleo
         storageRequest: 10G
       ironicInspector:
         replicas: 1
-        containerImage: quay.io/tripleozedcentos9/openstack-ironic-inspector:current-tripleo
-        pxeContainerImage: quay.io/tripleozedcentos9/openstack-ironic-pxe:current-tripleo
       secret: osp-secret