diff --git a/bindata/cloud-network-config-controller/managed/controller.yaml b/bindata/cloud-network-config-controller/managed/controller.yaml index 05c5ea8518..d08ea9924d 100644 --- a/bindata/cloud-network-config-controller/managed/controller.yaml +++ b/bindata/cloud-network-config-controller/managed/controller.yaml @@ -188,13 +188,9 @@ spec: - name: "NO_PROXY" value: "{{ .NO_PROXY}}" {{ end }} -{{- if not (eq .AzureManagedClientID "")}} - - name: "ARO_HCP_MI_CLIENT_ID" - value: "{{ .AzureManagedClientID }}" - - name: "ARO_HCP_TENANT_ID" - value: "{{ .AzureManagedTenantID }}" - - name: "ARO_HCP_CLIENT_CERTIFICATE_PATH" - value: "{{ .AzureManagedCertPath}}" +{{- if not (eq .AzureManagedSecretProviderClass "")}} + - name: "ARO_HCP_CLIENT_CREDENTIALS_PATH" + value: "{{ .AzureManagedCredsPath}}" {{ end }} resources: requests: @@ -214,7 +210,7 @@ spec: - name: cloud-token mountPath: /var/run/secrets/openshift/serviceaccount readOnly: true -{{- if not (eq .AzureManagedClientID "")}} +{{- if not (eq .AzureManagedSecretProviderClass "")}} - name: cncc-cert mountPath: {{.AzureManagedCertDirectory}} readOnly: true @@ -260,7 +256,7 @@ spec: - name: kube-cloud-config configMap: name: cloud-network-config-controller-kube-cloud-config -{{- if not (eq .AzureManagedClientID "")}} +{{- if not (eq .AzureManagedSecretProviderClass "")}} - name: cncc-cert csi: driver: secrets-store.csi.k8s.io diff --git a/pkg/network/cloud_network.go b/pkg/network/cloud_network.go index c7837be39d..3a756e9fb9 100644 --- a/pkg/network/cloud_network.go +++ b/pkg/network/cloud_network.go @@ -105,10 +105,8 @@ func renderCloudNetworkConfigController(conf *operv1.NetworkSpec, bootstrapResul data.Data["HTTP_PROXY"] = os.Getenv("MGMT_HTTP_PROXY") data.Data["HTTPS_PROXY"] = os.Getenv("MGMT_HTTPS_PROXY") data.Data["NO_PROXY"] = os.Getenv("MGMT_NO_PROXY") - data.Data["AzureManagedClientID"] = os.Getenv("ARO_HCP_MI_CLIENT_ID") - data.Data["AzureManagedTenantID"] = os.Getenv("ARO_HCP_TENANT_ID") data.Data["AzureManagedCertDirectory"] = azureCertPath - data.Data["AzureManagedCertPath"] = filepath.Join(azureCertPath, os.Getenv("ARO_HCP_CLIENT_CERTIFICATE_NAME")) + data.Data["AzureManagedCredsPath"] = filepath.Join(azureCertPath, os.Getenv("MANAGED_AZURE_HCP_CREDENTIALS_FILE_PATH")) data.Data["AzureManagedSecretProviderClass"] = os.Getenv("ARO_HCP_SECRET_PROVIDER_CLASS") caOverride.ObjectMeta = metav1.ObjectMeta{ Namespace: hcpCfg.Namespace,