Skip to content

OCPBUGS-44967: Pass only the certificate name for CNO deployment #5216

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

Merged
openshift-merge-bot merged 1 commit into from
Dec 5, 2024
Merged

OCPBUGS-44967: Pass only the certificate name for CNO deployment #5216

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
17 changes: 13 additions & 4 deletions control-plane-operator/controllers/hostedcontrolplane/cno/clusternetworkoperator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,11 +622,20 @@ if [[ -n $sc ]]; then kubectl --kubeconfig $kc delete --ignore-not-found validat
// to use on the CNCC deployment.
if azureutil.IsAroHCP() {
dep.Spec.Template.Spec.Containers[0].Env = append(dep.Spec.Template.Spec.Containers[0].Env,
azureutil.CreateEnvVarsForAzureManagedIdentity(params.AzureClientID, params.AzureTenantID, params.AzureCertificateName)...)

dep.Spec.Template.Spec.Containers[0].Env = append(dep.Spec.Template.Spec.Containers[0].Env,
corev1.EnvVar{
Name: "ARO_HCP_SECRET_PROVIDER_CLASS",
Name: config.ManagedAzureClientIdEnvVarKey,
Value: params.AzureClientID,
},
corev1.EnvVar{
Name: config.ManagedAzureTenantIdEnvVarKey,
Value: params.AzureTenantID,
},
corev1.EnvVar{
Name: config.ManagedAzureCertificateNameEnvVarKey,
Value: params.AzureCertificateName,
},
corev1.EnvVar{
Name: config.ManagedAzureSecretProviderClassEnvVarKey,
Value: config.ManagedAzureNetworkSecretStoreProviderClassName,
},
)
Expand Down
16 changes: 9 additions & 7 deletions support/config/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,15 @@ const (
// management cluster's resource group in Azure.
AROHCPKeyVaultManagedIdentityClientID = "ARO_HCP_KEY_VAULT_USER_CLIENT_ID"

ManagedAzureClientIdEnvVarKey = "ARO_HCP_MI_CLIENT_ID"
ManagedAzureTenantIdEnvVarKey = "ARO_HCP_TENANT_ID"
ManagedAzureCertificatePathEnvVarKey = "ARO_HCP_CLIENT_CERTIFICATE_PATH"
ManagedAzureCertificateMountPath = "/mnt/certs"
ManagedAzureCertificatePath = "/mnt/certs/"
ManagedAzureSecretsStoreCSIDriver = "secrets-store.csi.k8s.io"
ManagedAzureSecretProviderClass = "secretProviderClass"
ManagedAzureClientIdEnvVarKey = "ARO_HCP_MI_CLIENT_ID"
ManagedAzureTenantIdEnvVarKey = "ARO_HCP_TENANT_ID"
ManagedAzureCertificatePathEnvVarKey = "ARO_HCP_CLIENT_CERTIFICATE_PATH"
ManagedAzureCertificateNameEnvVarKey = "ARO_HCP_CLIENT_CERTIFICATE_NAME"
ManagedAzureSecretProviderClassEnvVarKey = "ARO_HCP_SECRET_PROVIDER_CLASS"
ManagedAzureCertificateMountPath = "/mnt/certs"
ManagedAzureCertificatePath = "/mnt/certs/"
ManagedAzureSecretsStoreCSIDriver = "secrets-store.csi.k8s.io"
ManagedAzureSecretProviderClass = "secretProviderClass"

ManagedAzureCPOSecretProviderClassName = "managed-azure-cpo"
ManagedAzureCPOSecretStoreVolumeName = "cpo-cert"
Expand Down