Release radix-operator

.vscode/launch.json

@@ -60,12 +60,13 @@
         "DNS_ZONE": "dev.radix.equinor.com",
         "RADIXOPERATOR_CLUSTER_TYPE": "development",
         "RADIXOPERATOR_DEFAULT_USER_GROUP": "64b28659-4fe4-4222-8497-85dd7e43e25b",
+        "RADIXOPERATOR_APP_BUILDER_RESOURCES_LIMITS_MEMORY": "2500M",
+        "RADIXOPERATOR_APP_BUILDER_RESOURCES_REQUESTS_MEMORY": "800M",
+        "RADIXOPERATOR_APP_BUILDER_RESOURCES_REQUESTS_CPU": "800m",
         "RADIXOPERATOR_APP_LIMITS_DEFAULT_MEMORY": "500M",
-        "RADIXOPERATOR_APP_LIMITS_DEFAULT_CPU": "400m",
         "RADIXOPERATOR_APP_LIMITS_DEFAULT_REQUEST_MEMORY": "50M",
-        "RADIXOPERATOR_APP_LIMITS_DEFAULT_REQUEST_CPU": "40m",
+        "RADIXOPERATOR_APP_LIMITS_DEFAULT_REQUEST_CPU": "100m",
         "RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_MEMORY": "500M",
-        "RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_CPU": "400m",
         "RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_REQUEST_MEMORY": "50M",
         "RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_REQUEST_CPU": "40m",
         "RADIXOPERATOR_APP_ROLLING_UPDATE_MAX_UNAVAILABLE": "25%",

charts/radix-operator/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: radix-operator
-version: 1.21.7
-appVersion: 1.41.7
+version: 1.21.9
+appVersion: 1.41.9
 kubeVersion: ">=1.24.0"
 description: Radix Operator
 keywords:

charts/radix-operator/templates/deployment.yaml

@@ -54,21 +54,24 @@ spec:
             # For configuring limit ranges on app namespaces
             - name: RADIXOPERATOR_APP_LIMITS_DEFAULT_MEMORY
               value: {{ .Values.app.limitrange.default.memory | quote }}
-            - name: RADIXOPERATOR_APP_LIMITS_DEFAULT_CPU
-              value: {{ .Values.app.limitrange.default.cpu | quote }}
             - name: RADIXOPERATOR_APP_LIMITS_DEFAULT_REQUEST_MEMORY
               value: {{ .Values.app.limitrange.defaultRequest.memory | quote }}
             - name: RADIXOPERATOR_APP_LIMITS_DEFAULT_REQUEST_CPU
               value: {{ .Values.app.limitrange.defaultRequest.cpu | quote }}
             # For configuring limit ranges on env namespaces
             - name: RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_MEMORY
               value: {{ .Values.app.env.limitrange.default.memory | quote }}
-            - name: RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_CPU
-              value: {{ .Values.app.env.limitrange.default.cpu | quote }}
             - name: RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_REQUEST_MEMORY
               value: {{ .Values.app.env.limitrange.defaultRequest.memory | quote }}
             - name: RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_REQUEST_CPU
               value: {{ .Values.app.env.limitrange.defaultRequest.cpu | quote }}
+            # For configuring limit ranges on app namespaces
+            - name: RADIXOPERATOR_APP_BUILDER_RESOURCES_LIMITS_MEMORY
+              value: {{ .Values.app.builder.resources.limits.memory | quote }}
+            - name: RADIXOPERATOR_APP_BUILDER_RESOURCES_REQUESTS_MEMORY
+              value: {{ .Values.app.builder.resources.requests.memory | quote }}
+            - name: RADIXOPERATOR_APP_BUILDER_RESOURCES_REQUESTS_CPU
+              value: {{ .Values.app.builder.resources.requests.cpu | quote }}
             # For configuring readiness probe
             - name: RADIXOPERATOR_APP_READINESS_PROBE_INITIAL_DELAY_SECONDS
               value: {{ .Values.app.readinessProbe.initialDelaySeconds | quote }}

charts/radix-operator/values.yaml

@@ -33,7 +33,6 @@ app:
   limitrange:
     default:
       memory: 450M
-      cpu: 2000m
     defaultRequest:
       memory: 450M
       cpu: 100m
@@ -42,10 +41,17 @@ app:
     limitrange:
       default:
         memory: 500M
-        cpu: 2000m
       defaultRequest:
         memory: 500M
-        cpu: 50m
+        cpu: 100m
+  builder:
+    # Limit range on builder job in app namespace
+    resources:
+      limits:
+        memory: 5000M
+      requests:
+        memory: 800M
+        cpu: 800m
   # Readiness probe parameters
   readinessProbe:
     initialDelaySeconds: 5

pipeline-runner/main.go

@@ -102,6 +102,9 @@ func setPipelineArgsFromArguments(cmd *cobra.Command, pipelineArgs *model.Pipeli
 	cmd.Flags().StringVar(&pipelineArgs.RadixConfigFile, defaults.RadixConfigFileEnvironmentVariable, "", "Radix config file name. Example: /workspace/radixconfig.yaml")
 	cmd.Flags().StringVar(&pipelineArgs.ImageTag, defaults.RadixImageTagEnvironmentVariable, "latest", "Docker image tag")
 	cmd.Flags().StringVar(&pipelineArgs.LogLevel, defaults.LogLevel, "INFO", "Log level: ERROR, INFO (default), DEBUG")
+	cmd.Flags().StringVar(&pipelineArgs.Builder.ResourcesLimitsMemory, defaults.OperatorAppBuilderResourcesLimitsMemoryEnvironmentVariable, "800M", "Image builder resource limit memory")
+	cmd.Flags().StringVar(&pipelineArgs.Builder.ResourcesRequestsCPU, defaults.OperatorAppBuilderResourcesRequestsCPUEnvironmentVariable, "800m", "Image builder resource requests CPU")
+	cmd.Flags().StringVar(&pipelineArgs.Builder.ResourcesRequestsMemory, defaults.OperatorAppBuilderResourcesRequestsMemoryEnvironmentVariable, "5000M", "Image builder resource requests memory")
 	var useCache string
 	cmd.Flags().StringVar(&useCache, defaults.RadixUseCacheEnvironmentVariable, "0", "Use cache")
 	var pushImage string

pipeline-runner/model/pipelineInfo.go

@@ -57,6 +57,13 @@ type PipelineInfo struct {
 	SourceDeploymentGitBranch     string
 }
 
+// Builder Holds info about the builder arguments
+type Builder struct {
+	ResourcesLimitsMemory   string
+	ResourcesRequestsCPU    string
+	ResourcesRequestsMemory string
+}
+
 // PipelineArguments Holds arguments for the pipeline
 type PipelineArguments struct {
 	PipelineType string
@@ -102,6 +109,7 @@ type PipelineArguments struct {
 	ImageTagNames map[string]string
 	LogLevel      string
 	AppName       string
+	Builder       Builder
 }
 
 // InitPipeline Initialize pipeline with step implementations

pipeline-runner/steps/build_acr.go

@@ -279,10 +279,13 @@ func createACRBuildContainers(appName string, pipelineInfo *model.PipelineInfo,
 				componentImage.Context, componentImage.Dockerfile, componentImage.ImagePath,
 				clusterTypeImage, clusterNameImage)
 			container.Command = containerCommand
-			resource := map[corev1.ResourceName]resource.Quantity{
-				corev1.ResourceMemory: resource.MustParse("800M"),
+			container.Resources.Requests = map[corev1.ResourceName]resource.Quantity{
+				corev1.ResourceCPU:    resource.MustParse(pipelineInfo.PipelineArguments.Builder.ResourcesRequestsCPU),
+				corev1.ResourceMemory: resource.MustParse(pipelineInfo.PipelineArguments.Builder.ResourcesRequestsMemory),
+			}
+			container.Resources.Limits = map[corev1.ResourceName]resource.Quantity{
+				corev1.ResourceMemory: resource.MustParse(pipelineInfo.PipelineArguments.Builder.ResourcesLimitsMemory),
 			}
-			container.Resources.Requests = resource
 		}
 		containers = append(containers, container)
 	}

pkg/apis/application/application_test.go

@@ -225,9 +225,8 @@ func TestOnSync_LimitsDefined_LimitsSet(t *testing.T) {
 	// Setup
 	tu, client, kubeUtil, radixClient := setupTest()
 	defer os.Clearenv()
-	os.Setenv(defaults.OperatorAppLimitDefaultCPUEnvironmentVariable, "0.5")
 	os.Setenv(defaults.OperatorAppLimitDefaultMemoryEnvironmentVariable, "300M")
-	os.Setenv(defaults.OperatorAppLimitDefaultReqestCPUEnvironmentVariable, "0.25")
+	os.Setenv(defaults.OperatorAppLimitDefaultRequestCPUEnvironmentVariable, "0.25")
 	os.Setenv(defaults.OperatorAppLimitDefaultRequestMemoryEnvironmentVariable, "256M")
 
 	// Test
@@ -244,9 +243,8 @@ func TestOnSync_NoLimitsDefined_NoLimitsSet(t *testing.T) {
 	// Setup
 	tu, client, kubeUtil, radixClient := setupTest()
 	defer os.Clearenv()
-	os.Setenv(defaults.OperatorAppLimitDefaultCPUEnvironmentVariable, "")
 	os.Setenv(defaults.OperatorAppLimitDefaultMemoryEnvironmentVariable, "")
-	os.Setenv(defaults.OperatorAppLimitDefaultReqestCPUEnvironmentVariable, "")
+	os.Setenv(defaults.OperatorAppLimitDefaultRequestCPUEnvironmentVariable, "")
 	os.Setenv(defaults.OperatorAppLimitDefaultRequestMemoryEnvironmentVariable, "")
 
 	// Test

pkg/apis/application/limitrange.go

@@ -10,26 +10,19 @@ const (
 )
 
 func (app *Application) createLimitRangeOnAppNamespace(namespace string) error {
-	defaultCPULimit := defaults.GetDefaultCPULimitForAppNamespace()
 	defaultMemoryLimit := defaults.GetDefaultMemoryLimitForAppNamespace()
 	defaultCPURequest := defaults.GetDefaultCPURequestForAppNamespace()
 	defaultMemoryRequest := defaults.GetDefaultMemoryRequestForAppNamespace()
 
 	// If not all limits are defined, then don't put any limits on namespace
-	if defaultCPULimit == nil ||
-		defaultMemoryLimit == nil ||
+	if defaultMemoryLimit == nil ||
 		defaultCPURequest == nil ||
 		defaultMemoryRequest == nil {
 		log.Warningf("Not all limits are defined for the Operator, so no limitrange will be put on namespace %s", namespace)
 		return nil
 	}
 
-	limitRange := app.kubeutil.BuildLimitRange(namespace,
-		limitRangeName, app.registration.Name,
-		*defaultCPULimit,
-		*defaultMemoryLimit,
-		*defaultCPURequest,
-		*defaultMemoryRequest)
+	limitRange := app.kubeutil.BuildLimitRange(namespace, limitRangeName, app.registration.Name, defaultMemoryLimit, defaultCPURequest, defaultMemoryRequest)
 
 	return app.kubeutil.ApplyLimitRange(namespace, limitRange)
 }

pkg/apis/batch/syncer_test.go

@@ -76,7 +76,6 @@ func (s *syncerTestSuite) SetupTest() {
 	s.promClient = prometheusfake.NewSimpleClientset()
 	s.kubeUtil, _ = kube.New(s.kubeClient, s.radixClient, secretproviderfake.NewSimpleClientset())
 	s.T().Setenv(defaults.OperatorEnvLimitDefaultMemoryEnvironmentVariable, "1500Mi")
-	s.T().Setenv(defaults.OperatorEnvLimitDefaultCPUEnvironmentVariable, "2000m")
 	s.T().Setenv(defaults.OperatorRollingUpdateMaxUnavailable, "25%")
 	s.T().Setenv(defaults.OperatorRollingUpdateMaxSurge, "25%")
 }

pkg/apis/defaults/resources.go

@@ -11,20 +11,17 @@ import (
 const (
 	OperatorDefaultUserGroupEnvironmentVariable             = "RADIXOPERATOR_DEFAULT_USER_GROUP"
 	OperatorEnvLimitDefaultMemoryEnvironmentVariable        = "RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_MEMORY"
-	OperatorEnvLimitDefaultCPUEnvironmentVariable           = "RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_CPU"
 	OperatorEnvLimitDefaultRequestMemoryEnvironmentVariable = "RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_REQUEST_MEMORY"
-	OperatorEnvLimitDefaultReqestCPUEnvironmentVariable     = "RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_REQUEST_CPU"
+	OperatorEnvLimitDefaultRequestCPUEnvironmentVariable    = "RADIXOPERATOR_APP_ENV_LIMITS_DEFAULT_REQUEST_CPU"
 
 	OperatorAppLimitDefaultMemoryEnvironmentVariable        = "RADIXOPERATOR_APP_LIMITS_DEFAULT_MEMORY"
-	OperatorAppLimitDefaultCPUEnvironmentVariable           = "RADIXOPERATOR_APP_LIMITS_DEFAULT_CPU"
 	OperatorAppLimitDefaultRequestMemoryEnvironmentVariable = "RADIXOPERATOR_APP_LIMITS_DEFAULT_REQUEST_MEMORY"
-	OperatorAppLimitDefaultReqestCPUEnvironmentVariable     = "RADIXOPERATOR_APP_LIMITS_DEFAULT_REQUEST_CPU"
-)
+	OperatorAppLimitDefaultRequestCPUEnvironmentVariable    = "RADIXOPERATOR_APP_LIMITS_DEFAULT_REQUEST_CPU"
 
-// GetDefaultCPULimitForAppNamespace Gets the default container CPU limit for app namespaces defined as an environment variable
-func GetDefaultCPULimitForAppNamespace() *resource.Quantity {
-	return getQuantityFromEnvironmentVariable(OperatorAppLimitDefaultCPUEnvironmentVariable)
-}
+	OperatorAppBuilderResourcesLimitsMemoryEnvironmentVariable   = "RADIXOPERATOR_APP_BUILDER_RESOURCES_LIMITS_MEMORY"
+	OperatorAppBuilderResourcesRequestsMemoryEnvironmentVariable = "RADIXOPERATOR_APP_BUILDER_RESOURCES_REQUESTS_MEMORY"
+	OperatorAppBuilderResourcesRequestsCPUEnvironmentVariable    = "RADIXOPERATOR_APP_BUILDER_RESOURCES_REQUESTS_CPU"
+)
 
 // GetDefaultMemoryLimitForAppNamespace Gets the default container memory limit for app namespaces defined as an environment variable
 func GetDefaultMemoryLimitForAppNamespace() *resource.Quantity {
@@ -33,34 +30,44 @@ func GetDefaultMemoryLimitForAppNamespace() *resource.Quantity {
 
 // GetDefaultCPURequestForAppNamespace Gets the default container CPU request for app namespaces defined as an environment variable
 func GetDefaultCPURequestForAppNamespace() *resource.Quantity {
-	return getQuantityFromEnvironmentVariable(OperatorAppLimitDefaultReqestCPUEnvironmentVariable)
+	return getQuantityFromEnvironmentVariable(OperatorAppLimitDefaultRequestCPUEnvironmentVariable)
 }
 
 // GetDefaultMemoryRequestForAppNamespace Gets the default container memory request for app namespaces defined as an environment variable
 func GetDefaultMemoryRequestForAppNamespace() *resource.Quantity {
 	return getQuantityFromEnvironmentVariable(OperatorAppLimitDefaultRequestMemoryEnvironmentVariable)
 }
 
-// GetDefaultCPULimit Gets the default container CPU limit defined as an environment variable
-func GetDefaultCPULimit() *resource.Quantity {
-	return getQuantityFromEnvironmentVariable(OperatorEnvLimitDefaultCPUEnvironmentVariable)
-}
-
 // GetDefaultMemoryLimit Gets the default container memory limit defined as an environment variable
 func GetDefaultMemoryLimit() *resource.Quantity {
 	return getQuantityFromEnvironmentVariable(OperatorEnvLimitDefaultMemoryEnvironmentVariable)
 }
 
 // GetDefaultCPURequest Gets the default container CPU request defined as an environment variable
 func GetDefaultCPURequest() *resource.Quantity {
-	return getQuantityFromEnvironmentVariable(OperatorEnvLimitDefaultReqestCPUEnvironmentVariable)
+	return getQuantityFromEnvironmentVariable(OperatorEnvLimitDefaultRequestCPUEnvironmentVariable)
 }
 
 // GetDefaultMemoryRequest Gets the default container memory request defined as an environment variable
 func GetDefaultMemoryRequest() *resource.Quantity {
 	return getQuantityFromEnvironmentVariable(OperatorEnvLimitDefaultRequestMemoryEnvironmentVariable)
 }
 
+// GetResourcesLimitsMemoryForAppBuilderNamespace Gets the default container memory limit for builder job in app namespaces defined as an environment variable
+func GetResourcesLimitsMemoryForAppBuilderNamespace() *resource.Quantity {
+	return getQuantityFromEnvironmentVariable(OperatorAppBuilderResourcesLimitsMemoryEnvironmentVariable)
+}
+
+// GetResourcesRequestsCPUForAppBuilderNamespace Gets the default container CPU request for builder job in app namespaces defined as an environment variable
+func GetResourcesRequestsCPUForAppBuilderNamespace() *resource.Quantity {
+	return getQuantityFromEnvironmentVariable(OperatorAppBuilderResourcesRequestsCPUEnvironmentVariable)
+}
+
+// GetResourcesRequestsMemoryForAppBuilderNamespace Gets the default container memory request for builder job in app namespaces defined as an environment variable
+func GetResourcesRequestsMemoryForAppBuilderNamespace() *resource.Quantity {
+	return getQuantityFromEnvironmentVariable(OperatorAppBuilderResourcesRequestsMemoryEnvironmentVariable)
+}
+
 func getQuantityFromEnvironmentVariable(envName string) *resource.Quantity {
 	quantityAsString := os.Getenv(envName)
 	if quantityAsString == "" {

pkg/apis/deployment/deployment_test.go

@@ -543,15 +543,14 @@ func TestObjectSynced_MultiJob_ContainsAllElements(t *testing.T) {
 				assert.Equal(t, int32(1), *getDeploymentByName(jobName, deployments).Spec.Replicas, "number of replicas was unexpected")
 
 				envVars := getContainerByName(jobName, getDeploymentByName(jobName, deployments).Spec.Template.Spec.Containers).Env
-				assert.Equal(t, 15, len(envVars), "number of environment variables was unexpected for component. It should contain default and custom")
+				assert.Equal(t, 14, len(envVars), "number of environment variables was unexpected for component. It should contain default and custom")
 				assert.Equal(t, "a_value", getEnvVariableByNameOnDeployment(kubeclient, "a_variable", jobName, deployments))
 				assert.Equal(t, anyContainerRegistry, getEnvVariableByNameOnDeployment(kubeclient, defaults.ContainerRegistryEnvironmentVariable, jobName, deployments))
 				assert.Equal(t, dnsZone, getEnvVariableByNameOnDeployment(kubeclient, defaults.RadixDNSZoneEnvironmentVariable, jobName, deployments))
 				assert.Equal(t, "AnyClusterName", getEnvVariableByNameOnDeployment(kubeclient, defaults.ClusternameEnvironmentVariable, jobName, deployments))
 				assert.Equal(t, environment, getEnvVariableByNameOnDeployment(kubeclient, defaults.EnvironmentnameEnvironmentVariable, jobName, deployments))
 				assert.Equal(t, appName, getEnvVariableByNameOnDeployment(kubeclient, defaults.RadixAppEnvironmentVariable, jobName, deployments))
 				assert.Equal(t, jobName, getEnvVariableByNameOnDeployment(kubeclient, defaults.RadixComponentEnvironmentVariable, jobName, deployments))
-				assert.Equal(t, "1", getEnvVariableByNameOnDeployment(kubeclient, defaults.OperatorEnvLimitDefaultCPUEnvironmentVariable, jobName, deployments))
 				assert.Equal(t, "300M", getEnvVariableByNameOnDeployment(kubeclient, defaults.OperatorEnvLimitDefaultMemoryEnvironmentVariable, jobName, deployments))
 				assert.Equal(t, "("+defaults.RadixJobSchedulerPortName+")", getEnvVariableByNameOnDeployment(kubeclient, defaults.RadixPortNamesEnvironmentVariable, jobName, deployments))
 				assert.True(t, envVariableByNameExistOnDeployment(defaults.RadixCommitHashEnvironmentVariable, jobName, deployments))

pkg/apis/deployment/jobschedulercomponent.go

@@ -46,7 +46,6 @@ func (js *jobSchedulerComponent) GetEnvironmentVariables() v1.EnvVarsMap {
 		envVarsMap = v1.EnvVarsMap{}
 	}
 	envVarsMap[defaults.RadixDeploymentEnvironmentVariable] = js.radixDeployment.Name
-	envVarsMap[defaults.OperatorEnvLimitDefaultCPUEnvironmentVariable] = os.Getenv(defaults.OperatorEnvLimitDefaultCPUEnvironmentVariable)
 	envVarsMap[defaults.OperatorEnvLimitDefaultMemoryEnvironmentVariable] = os.Getenv(defaults.OperatorEnvLimitDefaultMemoryEnvironmentVariable)
 	return envVarsMap
 }

pkg/apis/deployment/kubedeployment_test.go

@@ -97,8 +97,7 @@ func TestGetResourceRequirements_BothProvided_OverDefaultLimits(t *testing.T) {
 
 	assert.Equal(t, 0, requirements.Requests.Cpu().Cmp(resource.MustParse("5")), "CPU request should be included")
 	assert.Equal(t, 0, requirements.Requests.Memory().Cmp(resource.MustParse("5Gi")), "Memory request should be included")
-
-	assert.Equal(t, 0, requirements.Limits.Cpu().Cmp(resource.MustParse("5")), "CPU limit should be same as request")
+	assert.True(t, requirements.Limits.Cpu().IsZero())
 	assert.Equal(t, 0, requirements.Limits.Memory().Cmp(resource.MustParse("5Gi")), "Memory limit should be same as request")
 }
 
@@ -117,7 +116,7 @@ func TestGetResourceRequirements_ProvideRequestsCpu_OverDefaultLimits(t *testing
 	assert.Equal(t, 0, requirements.Requests.Cpu().Cmp(resource.MustParse("6")), "CPU request should be included")
 	assert.Equal(t, 0, requirements.Requests.Memory().Cmp(resource.MustParse("0")), "Missing memory request should be 0")
 
-	assert.Equal(t, 0, requirements.Limits.Cpu().Cmp(resource.MustParse("6")), "CPU limit should be same as request")
+	assert.True(t, requirements.Limits.Cpu().IsZero())
 	assert.Equal(t, 0, requirements.Limits.Memory().Cmp(resource.MustParse("0")), "Missing memory limit should be 0")
 }
 

pkg/apis/deployment/oauthproxyresourcemanager_test.go

@@ -51,7 +51,6 @@ func (*OAuthProxyResourceManagerTestSuite) SetupSuite() {
 	os.Setenv(defaults.OperatorDefaultUserGroupEnvironmentVariable, "1234-5678-91011")
 	os.Setenv(defaults.OperatorDNSZoneEnvironmentVariable, dnsZone)
 	os.Setenv(defaults.OperatorAppAliasBaseURLEnvironmentVariable, "app.dev.radix.equinor.com")
-	os.Setenv(defaults.OperatorEnvLimitDefaultCPUEnvironmentVariable, "1")
 	os.Setenv(defaults.OperatorEnvLimitDefaultMemoryEnvironmentVariable, "300M")
 	os.Setenv(defaults.OperatorRollingUpdateMaxUnavailable, "25%")
 	os.Setenv(defaults.OperatorRollingUpdateMaxSurge, "25%")
@@ -66,7 +65,6 @@ func (*OAuthProxyResourceManagerTestSuite) TearDownSuite() {
 	os.Unsetenv(defaults.OperatorDefaultUserGroupEnvironmentVariable)
 	os.Unsetenv(defaults.OperatorDNSZoneEnvironmentVariable)
 	os.Unsetenv(defaults.OperatorAppAliasBaseURLEnvironmentVariable)
-	os.Unsetenv(defaults.OperatorEnvLimitDefaultCPUEnvironmentVariable)
 	os.Unsetenv(defaults.OperatorEnvLimitDefaultMemoryEnvironmentVariable)
 	os.Unsetenv(defaults.OperatorRollingUpdateMaxUnavailable)
 	os.Unsetenv(defaults.OperatorRollingUpdateMaxSurge)