Skip to content

[Backport into 5.18] Remove root secret from pod env variables #1723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 5.18
Choose a base branch
from
Open

[Backport into 5.18] Remove root secret from pod env variables #1723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion deploy/internal/deployment-endpoint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion deploy/internal/statefulset-core.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions pkg/bundle/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions pkg/system/phase2_creating.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Copy link
Member

@dannyzaken dannyzaken Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I remember correcly, we are not removing any envs that are already set on the Sts\deployment. We should probably see if this env is set and explictly remove/reset it.

c.Env[j].Value = r.SecretRootMasterKey
case "NODE_EXTRA_CA_CERTS":
c.Env[j].Value = r.ApplyCAsToPods
case "GUARANTEED_LOGS_PATH":
Expand Down
2 changes: 0 additions & 2 deletions pkg/system/phase4_configuring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading