diff --git a/pkg/nova/cellmapping.go b/pkg/nova/cellmapping.go index f7e58e93d..fc9e25f09 100644 --- a/pkg/nova/cellmapping.go +++ b/pkg/nova/cellmapping.go @@ -21,7 +21,6 @@ func CellMappingJob( args := []string{"-c", KollaServiceCommand} envVars := map[string]env.Setter{} - envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS") envVars["KOLLA_BOOTSTRAP"] = env.SetValue("true") envVars["CELL_NAME"] = env.SetValue(cell.Spec.CellName) diff --git a/pkg/nova/host_discover.go b/pkg/nova/host_discover.go index 7b8cd9d7a..c1124fc10 100644 --- a/pkg/nova/host_discover.go +++ b/pkg/nova/host_discover.go @@ -34,7 +34,6 @@ func HostDiscoveryJob( args := []string{"-c", KollaServiceCommand} envVars := map[string]env.Setter{} - envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS") envVars["KOLLA_BOOTSTRAP"] = env.SetValue("true") // This is stored in the Job so that if the input of the job changes diff --git a/pkg/novaapi/deployment.go b/pkg/novaapi/deployment.go index 70068f424..82edcc602 100644 --- a/pkg/novaapi/deployment.go +++ b/pkg/novaapi/deployment.go @@ -80,7 +80,6 @@ func StatefulSet( } envVars := map[string]env.Setter{} - envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS") // NOTE(gibi): The statefulset does not use this hash directly. We store it // in the environment to trigger a Pod restart if any input of the // statefulset has changed. The k8s will trigger a restart automatically if diff --git a/pkg/novacompute/deployment.go b/pkg/novacompute/deployment.go index 1a5aadfa6..9e04235b5 100644 --- a/pkg/novacompute/deployment.go +++ b/pkg/novacompute/deployment.go @@ -67,7 +67,7 @@ func StatefulSet( } envVars := map[string]env.Setter{} - envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS") + // NOTE(gibi): The statefulset does not use this hash directly. We store it // in the environment to trigger a Pod restart if any input of the // statefulset has changed. The k8s will trigger a restart automatically if diff --git a/pkg/novaconductor/dbpurge.go b/pkg/novaconductor/dbpurge.go index 15eb64a3d..9d354a36a 100644 --- a/pkg/novaconductor/dbpurge.go +++ b/pkg/novaconductor/dbpurge.go @@ -22,7 +22,6 @@ func DBPurgeCronJob( args := []string{"-c", nova.KollaServiceCommand} envVars := map[string]env.Setter{} - envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS") envVars["KOLLA_BOOTSTRAP"] = env.SetValue("true") envVars["ARCHIVE_AGE"] = env.SetValue(fmt.Sprintf("%d", *instance.Spec.DBPurge.ArchiveAge)) diff --git a/pkg/novaconductor/dbsync.go b/pkg/novaconductor/dbsync.go index 078722c05..045cef665 100644 --- a/pkg/novaconductor/dbsync.go +++ b/pkg/novaconductor/dbsync.go @@ -37,7 +37,6 @@ func CellDBSyncJob( args := []string{"-c", nova.KollaServiceCommand} envVars := map[string]env.Setter{} - envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS") envVars["KOLLA_BOOTSTRAP"] = env.SetValue("true") envVars["CELL_NAME"] = env.SetValue(instance.Spec.CellName) diff --git a/pkg/novaconductor/deployment.go b/pkg/novaconductor/deployment.go index 6db2241b2..733e28abd 100644 --- a/pkg/novaconductor/deployment.go +++ b/pkg/novaconductor/deployment.go @@ -73,7 +73,6 @@ func StatefulSet( } envVars := map[string]env.Setter{} - envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS") // NOTE(gibi): The statefulset does not use this hash directly. We store it // in the environment to trigger a Pod restart if any input of the // statefulset has changed. The k8s will trigger a restart automatically if diff --git a/pkg/novametadata/deployment.go b/pkg/novametadata/deployment.go index de0ef21ca..65a8566cc 100644 --- a/pkg/novametadata/deployment.go +++ b/pkg/novametadata/deployment.go @@ -78,7 +78,6 @@ func StatefulSet( } envVars := map[string]env.Setter{} - envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS") // NOTE(gibi): The statefulset does not use this hash directly. We store it // in the environment to trigger a Pod restart if any input of the // statefulset has changed. The k8s will trigger a restart automatically if diff --git a/pkg/novascheduler/deployment.go b/pkg/novascheduler/deployment.go index a06615ba5..e5d0ec5b2 100644 --- a/pkg/novascheduler/deployment.go +++ b/pkg/novascheduler/deployment.go @@ -77,7 +77,6 @@ func StatefulSet( } envVars := map[string]env.Setter{} - envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS") // NOTE(gibi): The statefulset does not use this hash directly. We store it // in the environment to trigger a Pod restart if any input of the // statefulset has changed. The k8s will trigger a restart automatically if diff --git a/pkg/novncproxy/deployment.go b/pkg/novncproxy/deployment.go index 94853cb7a..b9938a06e 100644 --- a/pkg/novncproxy/deployment.go +++ b/pkg/novncproxy/deployment.go @@ -81,7 +81,6 @@ func StatefulSet( } envVars := map[string]env.Setter{} - envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS") // NOTE(gibi): The statefulset does not use this hash directly. We store it // in the environment to trigger a Pod restart if any input of the // statefulset has changed. The k8s will trigger a restart automatically if diff --git a/test/kuttl/test-suites/default/scale-tests/01-assert.yaml b/test/kuttl/test-suites/default/scale-tests/01-assert.yaml index 54a7bc6ca..d181cddfb 100644 --- a/test/kuttl/test-suites/default/scale-tests/01-assert.yaml +++ b/test/kuttl/test-suites/default/scale-tests/01-assert.yaml @@ -533,8 +533,6 @@ spec: value: "30" - name: KOLLA_BOOTSTRAP value: "true" - - name: KOLLA_CONFIG_STRATEGY - value: COPY_ALWAYS - name: PURGE_AGE value: "90" image: quay.io/podified-antelope-centos9/openstack-nova-conductor:current-podified @@ -591,8 +589,6 @@ spec: value: "30" - name: KOLLA_BOOTSTRAP value: "true" - - name: KOLLA_CONFIG_STRATEGY - value: COPY_ALWAYS - name: PURGE_AGE value: "90" image: quay.io/podified-antelope-centos9/openstack-nova-conductor:current-podified