Skip to content

HOSTEDCP-2035: Set up Azure authentication with cert for ARO HCP #2522

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
Oct 24, 2024
Merged

HOSTEDCP-2035: Set up Azure authentication with cert for ARO HCP #2522

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
23 changes: 21 additions & 2 deletions bindata/cloud-network-config-controller/managed/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ spec:
value: "{{.KubernetesServicePort}}"
- name: KUBERNETES_SERVICE_HOST
value: "{{.KubernetesServiceHost}}"
- name: AZURE_MSI_AUTHENTICATION
value: "{{.AzureMSIAuthentication}}"
containers:
# hosted-cluster-token creates a token with a custom path(/var/run/secrets/hosted_cluster/token)
# The token path is included in the kubeconfig used by cncc containers to talk to the hosted clusters API server
Expand Down Expand Up @@ -184,6 +182,14 @@ spec:
{{ if .NO_PROXY }}
- 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}}"
{{ end }}
resources:
requests:
Expand All @@ -203,6 +209,11 @@ spec:
- name: cloud-token
mountPath: /var/run/secrets/openshift/serviceaccount
readOnly: true
{{- if not (eq .AzureManagedClientID "")}}
- name: cncc-cert
mountPath: {{.AzureManagedCertDirectory}}
readOnly: true
{{- end }}
terminationMessagePolicy: FallbackToLogsOnError
tolerations:
{{- if .HCPTolerations }}
Expand Down Expand Up @@ -244,3 +255,11 @@ spec:
- name: kube-cloud-config
configMap:
name: cloud-network-config-controller-kube-cloud-config
{{- if not (eq .AzureManagedClientID "")}}
- name: cncc-cert
csi:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: {{.AzureManagedSecretProviderClass}}
{{- end }}
8 changes: 7 additions & 1 deletion pkg/network/cloud_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import (
uns "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
)

const azureCertPath = "/var/run/secrets/azure"

// renderCloudNetworkConfigController renders the cloud network config controller
func renderCloudNetworkConfigController(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.BootstrapResult, manifestDir string) ([]*uns.Unstructured, error) {
cloudBootstrapResult := bootstrapResult.Infra
Expand Down Expand Up @@ -102,7 +104,11 @@ 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["AzureMSIAuthentication"] = os.Getenv("AZURE_MSI_AUTHENTICATION")
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["AzureManagedSecretProviderClass"] = os.Getenv("ARO_HCP_SECRET_PROVIDER_CLASS")
caOverride.ObjectMeta = metav1.ObjectMeta{
Namespace: hcpCfg.Namespace,
Name: "cloud-network-config-controller-kube-cloud-config",
Expand Down