diff --git a/deploy/internal/deployment-endpoint.yaml b/deploy/internal/deployment-endpoint.yaml index 0e6d068e80..36fe437e59 100644 --- a/deploy/internal/deployment-endpoint.yaml +++ b/deploy/internal/deployment-endpoint.yaml @@ -117,7 +117,6 @@ spec: - name: ENDPOINT_GROUP_ID - name: LOCAL_MD_SERVER - name: LOCAL_N2N_AGENT - - name: NOOBAA_ROOT_SECRET - name: NODE_EXTRA_CA_CERTS - name: GUARANTEED_LOGS_PATH - name: CONTAINER_CPU_REQUEST diff --git a/deploy/internal/statefulset-core.yaml b/deploy/internal/statefulset-core.yaml index c76499ecdd..dc6a4aecb3 100644 --- a/deploy/internal/statefulset-core.yaml +++ b/deploy/internal/statefulset-core.yaml @@ -116,7 +116,6 @@ spec: value: postgres - name: CONTAINER_PLATFORM value: KUBERNETES - - name: NOOBAA_ROOT_SECRET - name: NODE_EXTRA_CA_CERTS - name: AGENT_PROFILE value: VALUE_AGENT_PROFILE diff --git a/pkg/bundle/deploy.go b/pkg/bundle/deploy.go index 2166e9d8d9..2971067b55 100644 --- a/pkg/bundle/deploy.go +++ b/pkg/bundle/deploy.go @@ -3865,7 +3865,7 @@ data: pg_stat_statements.track = all ` -const Sha256_deploy_internal_deployment_endpoint_yaml = "21b206c9119e37c4ebba84d5c1e2b1d45b06c716b4def69db9ba9268ef75e1e1" +const Sha256_deploy_internal_deployment_endpoint_yaml = "e76dc7c81a02fb396263e61311b2bc0d765f32377d1b9d2ec3f435fced2fb0c3" const File_deploy_internal_deployment_endpoint_yaml = `apiVersion: apps/v1 kind: Deployment @@ -3986,7 +3986,6 @@ spec: - name: ENDPOINT_GROUP_ID - name: LOCAL_MD_SERVER - name: LOCAL_N2N_AGENT - - name: NOOBAA_ROOT_SECRET - name: NODE_EXTRA_CA_CERTS - name: GUARANTEED_LOGS_PATH - name: CONTAINER_CPU_REQUEST @@ -4926,7 +4925,7 @@ spec: noobaa-s3-svc: "true" ` -const Sha256_deploy_internal_statefulset_core_yaml = "50e5b11d8e0a2f2bb8a6db8d154b34b6569e160fa7ad2b1fb154001b36c8a152" +const Sha256_deploy_internal_statefulset_core_yaml = "14226b25028637a7176dbdb4a6fa6e90a9e63cddd5f39cbe0c044f433b0a4764" const File_deploy_internal_statefulset_core_yaml = `apiVersion: apps/v1 kind: StatefulSet @@ -5046,7 +5045,6 @@ spec: value: postgres - name: CONTAINER_PLATFORM value: KUBERNETES - - name: NOOBAA_ROOT_SECRET - name: NODE_EXTRA_CA_CERTS - name: AGENT_PROFILE value: VALUE_AGENT_PROFILE diff --git a/pkg/system/phase2_creating.go b/pkg/system/phase2_creating.go index 949bfaad62..db376a4cf1 100644 --- a/pkg/system/phase2_creating.go +++ b/pkg/system/phase2_creating.go @@ -450,8 +450,6 @@ func (r *Reconciler) setDesiredCoreEnv(c *corev1.Container) { if r.NooBaa.Spec.ExternalPgSSLUnauthorized { c.Env[j].Value = "true" } - case "NOOBAA_ROOT_SECRET": - c.Env[j].Value = r.SecretRootMasterKey case "NODE_EXTRA_CA_CERTS": c.Env[j].Value = r.ApplyCAsToPods case "GUARANTEED_LOGS_PATH": diff --git a/pkg/system/phase4_configuring.go b/pkg/system/phase4_configuring.go index bd4868bef9..9eac439bbd 100644 --- a/pkg/system/phase4_configuring.go +++ b/pkg/system/phase4_configuring.go @@ -371,8 +371,6 @@ func (r *Reconciler) SetDesiredDeploymentEndpoint() error { if r.JoinSecret == nil { c.Env[j].Value = "true" } - case "NOOBAA_ROOT_SECRET": - c.Env[j].Value = r.SecretRootMasterKey case "VIRTUAL_HOSTS": hosts := []string{} for _, addr := range r.NooBaa.Status.Services.ServiceS3.InternalDNS {