Remove KOLLA_COPY_STRATEGY as COPY_ALWAYS is the default now

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)
 

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

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

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

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))

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)

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

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

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

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

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