removed ansibleEEEnvConfigMapName from nodeset level as it willl conflict with DeployOnAllNodeSet services

oliashish · openshift-cherrypick-robot · commit 7e3e229130a1 · 2026-02-26T13:14:12.000Z
diff --git a/api/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml b/api/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml
@@ -60,12 +60,11 @@ spec:
               of OpenStackDataPlaneDeployment
             properties:
               ansibleEEEnvConfigMapName:
+                default: openstack-aee-default-env
                 description: |-
                   AnsibleEEEnvConfigMapName is the name of the ConfigMap containing environment
                   variables to inject into the Ansible Execution Environment pod.
-                  If set, this takes precedence over the NodeSet's AnsibleEEEnvConfigMapName.
-                  If not specified, the NodeSet's AnsibleEEEnvConfigMapName is used, or the
-                  default "openstack-aee-default-env" if neither is set.
+                  If not specified, defaults to "openstack-aee-default-env".
                 maxLength: 253
                 type: string
               ansibleExtraVars:
diff --git a/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -55,18 +55,6 @@ spec:
             description: OpenStackDataPlaneNodeSetSpec defines the desired state of
               OpenStackDataPlaneNodeSet
             properties:
-              ansibleEEEnvConfigMapName:
-                default: openstack-aee-default-env
-                description: |-
-                  AnsibleEEEnvConfigMapName is the name of the ConfigMap containing environment
-                  variables to inject into the Ansible Execution Environment pod.
-                  The ConfigMap should contain environment variables used by ansible-runner
-                  such as ANSIBLE_VERBOSITY, ANSIBLE_FORCE_COLOR, or other runner settings.
-                  See https://ansible.readthedocs.io/projects/runner/en/stable/intro/#env-settings-settings-for-runner-itself
-                  If not specified, defaults to "openstack-aee-default-env".
-                  This can be overridden at the Deployment level.
-                maxLength: 253
-                type: string
               baremetalSetTemplate:
                 description: BaremetalSetTemplate Template for BaremetalSet for the
                   NodeSet
diff --git a/api/dataplane/v1beta1/openstackdataplanedeployment_types.go b/api/dataplane/v1beta1/openstackdataplanedeployment_types.go
@@ -72,13 +72,11 @@ type OpenStackDataPlaneDeploymentSpec struct {
 	// AnsibleJobNodeSelector to target subset of worker nodes running the ansible jobs
 	AnsibleJobNodeSelector map[string]string `json:"ansibleJobNodeSelector,omitempty"`
 
-	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:MaxLength:=253
+	// +kubebuilder:default="openstack-aee-default-env"
 	// AnsibleEEEnvConfigMapName is the name of the ConfigMap containing environment
 	// variables to inject into the Ansible Execution Environment pod.
-	// If set, this takes precedence over the NodeSet's AnsibleEEEnvConfigMapName.
-	// If not specified, the NodeSet's AnsibleEEEnvConfigMapName is used, or the
-	// default "openstack-aee-default-env" if neither is set.
+	// If not specified, defaults to "openstack-aee-default-env".
 	AnsibleEEEnvConfigMapName string `json:"ansibleEEEnvConfigMapName,omitempty"`
 }
 
diff --git a/api/dataplane/v1beta1/openstackdataplanenodeset_types.go b/api/dataplane/v1beta1/openstackdataplanenodeset_types.go
@@ -86,18 +86,6 @@ type OpenStackDataPlaneNodeSetSpec struct {
 	// +kubebuilder:default=true
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
 	TLSEnabled bool `json:"tlsEnabled" yaml:"tlsEnabled"`
-
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default="openstack-aee-default-env"
-	// +kubebuilder:validation:MaxLength:=253
-	// AnsibleEEEnvConfigMapName is the name of the ConfigMap containing environment
-	// variables to inject into the Ansible Execution Environment pod.
-	// The ConfigMap should contain environment variables used by ansible-runner
-	// such as ANSIBLE_VERBOSITY, ANSIBLE_FORCE_COLOR, or other runner settings.
-	// See https://ansible.readthedocs.io/projects/runner/en/stable/intro/#env-settings-settings-for-runner-itself
-	// If not specified, defaults to "openstack-aee-default-env".
-	// This can be overridden at the Deployment level.
-	AnsibleEEEnvConfigMapName string `json:"ansibleEEEnvConfigMapName,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -221,7 +209,6 @@ func (instance OpenStackDataPlaneNodeSet) GetAnsibleEESpec() AnsibleEESpec {
 		ExtraMounts:               instance.Spec.NodeTemplate.ExtraMounts,
 		Env:                       instance.Spec.Env,
 		ServiceAccountName:        instance.Name,
-		AnsibleEEEnvConfigMapName: instance.Spec.AnsibleEEEnvConfigMapName,
 	}
 }
 
diff --git a/bindata/crds/crds.yaml b/bindata/crds/crds.yaml
@@ -18371,12 +18371,11 @@ spec:
               of OpenStackDataPlaneDeployment
             properties:
               ansibleEEEnvConfigMapName:
+                default: openstack-aee-default-env
                 description: |-
                   AnsibleEEEnvConfigMapName is the name of the ConfigMap containing environment
                   variables to inject into the Ansible Execution Environment pod.
-                  If set, this takes precedence over the NodeSet's AnsibleEEEnvConfigMapName.
-                  If not specified, the NodeSet's AnsibleEEEnvConfigMapName is used, or the
-                  default "openstack-aee-default-env" if neither is set.
+                  If not specified, defaults to "openstack-aee-default-env".
                 maxLength: 253
                 type: string
               ansibleExtraVars:
@@ -18634,18 +18633,6 @@ spec:
             description: OpenStackDataPlaneNodeSetSpec defines the desired state of
               OpenStackDataPlaneNodeSet
             properties:
-              ansibleEEEnvConfigMapName:
-                default: openstack-aee-default-env
-                description: |-
-                  AnsibleEEEnvConfigMapName is the name of the ConfigMap containing environment
-                  variables to inject into the Ansible Execution Environment pod.
-                  The ConfigMap should contain environment variables used by ansible-runner
-                  such as ANSIBLE_VERBOSITY, ANSIBLE_FORCE_COLOR, or other runner settings.
-                  See https://ansible.readthedocs.io/projects/runner/en/stable/intro/#env-settings-settings-for-runner-itself
-                  If not specified, defaults to "openstack-aee-default-env".
-                  This can be overridden at the Deployment level.
-                maxLength: 253
-                type: string
               baremetalSetTemplate:
                 description: BaremetalSetTemplate Template for BaremetalSet for the
                   NodeSet
diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml
@@ -60,12 +60,11 @@ spec:
               of OpenStackDataPlaneDeployment
             properties:
               ansibleEEEnvConfigMapName:
+                default: openstack-aee-default-env
                 description: |-
                   AnsibleEEEnvConfigMapName is the name of the ConfigMap containing environment
                   variables to inject into the Ansible Execution Environment pod.
-                  If set, this takes precedence over the NodeSet's AnsibleEEEnvConfigMapName.
-                  If not specified, the NodeSet's AnsibleEEEnvConfigMapName is used, or the
-                  default "openstack-aee-default-env" if neither is set.
+                  If not specified, defaults to "openstack-aee-default-env".
                 maxLength: 253
                 type: string
               ansibleExtraVars:
diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -55,18 +55,6 @@ spec:
             description: OpenStackDataPlaneNodeSetSpec defines the desired state of
               OpenStackDataPlaneNodeSet
             properties:
-              ansibleEEEnvConfigMapName:
-                default: openstack-aee-default-env
-                description: |-
-                  AnsibleEEEnvConfigMapName is the name of the ConfigMap containing environment
-                  variables to inject into the Ansible Execution Environment pod.
-                  The ConfigMap should contain environment variables used by ansible-runner
-                  such as ANSIBLE_VERBOSITY, ANSIBLE_FORCE_COLOR, or other runner settings.
-                  See https://ansible.readthedocs.io/projects/runner/en/stable/intro/#env-settings-settings-for-runner-itself
-                  If not specified, defaults to "openstack-aee-default-env".
-                  This can be overridden at the Deployment level.
-                maxLength: 253
-                type: string
               baremetalSetTemplate:
                 description: BaremetalSetTemplate Template for BaremetalSet for the
                   NodeSet
diff --git a/internal/controller/dataplane/openstackdataplanedeployment_controller.go b/internal/controller/dataplane/openstackdataplanedeployment_controller.go
@@ -288,10 +288,7 @@ func (r *OpenStackDataPlaneDeploymentReconciler) Reconcile(ctx context.Context,
 		ansibleEESpec.AnsibleSkipTags = instance.Spec.AnsibleSkipTags
 		ansibleEESpec.AnsibleLimit = instance.Spec.AnsibleLimit
 		ansibleEESpec.ExtraVars = instance.Spec.AnsibleExtraVars
-		// override the ansibleEEEnvConfigMapName on nodeset if there is any provided for a specific deployment.
-		if instance.Spec.AnsibleEEEnvConfigMapName != "" {
-			ansibleEESpec.AnsibleEEEnvConfigMapName = instance.Spec.AnsibleEEEnvConfigMapName
-		}
+		ansibleEESpec.AnsibleEEEnvConfigMapName = instance.Spec.AnsibleEEEnvConfigMapName
 
 		if nodeSet.Status.DNSClusterAddresses != nil && nodeSet.Status.CtlplaneSearchDomain != "" {
 			ansibleEESpec.DNSConfig = &corev1.PodDNSConfig{
diff --git a/internal/dataplane/util/ansible_execution.go b/internal/dataplane/util/ansible_execution.go
@@ -66,10 +66,11 @@ func AnsibleExecution(
 		return nil
 	}
 
-	// Fallback for backwards compatibility with existing NodeSets created
-	// before ansibleEEEnvConfigMapName field was added
+	// Use Deployment's ansibleEEEnvConfigMapName if set, otherwise default
 	envConfigMapName := aeeSpec.AnsibleEEEnvConfigMapName
 	if envConfigMapName == "" {
+		// Default must match kubebuilder:default in
+		// openstackdataplanedeployment_types.go for backward compatibility
 		envConfigMapName = "openstack-aee-default-env"
 	}
 
diff --git a/internal/webhook/dataplane/v1beta1/openstackdataplanedeployment_webhook.go b/internal/webhook/dataplane/v1beta1/openstackdataplanedeployment_webhook.go
@@ -94,7 +94,8 @@ func (v *OpenStackDataPlaneDeploymentCustomValidator) ValidateCreate(_ context.C
 	if !ok {
 		return nil, fmt.Errorf("expected a OpenStackDataPlaneDeployment object but got %T", obj)
 	}
-	openstackdataplanedeploymentlog.Info("Validation for OpenStackDataPlaneDeployment upon creation", "name", openstackdataplanedeployment.GetName())
+	openstackdataplanedeploymentlog.Info("Validation for OpenStackDataPlaneDeployment upon creation", "name",
+		openstackdataplanedeployment.GetName())
 
 	// Call the ValidateCreate method on the OpenStackDataPlaneDeployment type
 	return openstackdataplanedeployment.ValidateCreate()
diff --git a/test/functional/dataplane/openstackdataplanedeployment_controller_test.go b/test/functional/dataplane/openstackdataplanedeployment_controller_test.go
diff --git a/test/functional/dataplane/openstackdataplanenodeset_controller_test.go b/test/functional/dataplane/openstackdataplanenodeset_controller_test.go

Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,11 @@ func AnsibleExecution(`
`66`	`66`	`return nil`
`67`	`67`	`}`
`68`	`68`
`69`		`- // Fallback for backwards compatibility with existing NodeSets created`
`70`		`- // before ansibleEEEnvConfigMapName field was added`
	`69`	`+ // Use Deployment's ansibleEEEnvConfigMapName if set, otherwise default`
`71`	`70`	`envConfigMapName := aeeSpec.AnsibleEEEnvConfigMapName`
`72`	`71`	`if envConfigMapName == "" {`
	`72`	`+ // Default must match kubebuilder:default in`
	`73`	`+ // openstackdataplanedeployment_types.go for backward compatibility`
`73`	`74`	`envConfigMapName = "openstack-aee-default-env"`
`74`	`75`	`}`
`75`	`76`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@ func (v *OpenStackDataPlaneDeploymentCustomValidator) ValidateCreate(_ context.C`
`94`	`94`	`if !ok {`
`95`	`95`	`return nil, fmt.Errorf("expected a OpenStackDataPlaneDeployment object but got %T", obj)`
`96`	`96`	`}`
`97`		`- openstackdataplanedeploymentlog.Info("Validation for OpenStackDataPlaneDeployment upon creation", "name", openstackdataplanedeployment.GetName())`
	`97`	`+ openstackdataplanedeploymentlog.Info("Validation for OpenStackDataPlaneDeployment upon creation", "name",`
	`98`	`+ openstackdataplanedeployment.GetName())`
`98`	`99`
`99`	`100`	`// Call the ValidateCreate method on the OpenStackDataPlaneDeployment type`
`100`	`101`	`return openstackdataplanedeployment.ValidateCreate()`