Skip to content

feat(rcv1p): unify cert bootstrap flow and add Windows CA refresh task #8096

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

Draft
rchincha wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

feat(rcv1p): unify cert bootstrap flow and add Windows CA refresh task #8096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
89d1f8c
feat: bump windows image version for 2026-03B (#8074)
aks-node-assistant[bot] Mar 13, 2026
741eb3d
feat(rcv1p): unify cert bootstrap flow and add Windows CA refresh task
Mar 16, 2026
4b6137e
feat: enhance CA certificates refresh task with endpoint mode based o…
Mar 18, 2026
f554537
feat: add tests for certificate endpoint mode handling in AKS custom …
Mar 19, 2026
d953dba
feat: simplify certificate endpoint mode handling and refresh task re…
Mar 19, 2026
a1de4d8
feat: implement conditional CA certificates refresh task registration…
Mar 19, 2026
72082ba
feat: enhance CA certificates refresh task registration for legacy CS…
Mar 19, 2026
6a56f53
feat: update tests for certificate endpoint mode handling and refresh…
Mar 20, 2026
c24e543
feat: refactor test setup functions for improved readability and cons…
Mar 20, 2026
9410fd0
feat: update Get-CustomCloudCertEndpointModeFromLocation to clarify e…
Mar 20, 2026
c9d8f7d
feat: enhance tests for Should-InstallCACertificatesRefreshTask and G…
Mar 20, 2026
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
7 changes: 6 additions & 1 deletion aks-node-controller/parser/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ func getFuncMap() template.FuncMap {
return template.FuncMap{
"getInitAKSCustomCloudFilepath": getInitAKSCustomCloudFilepath,
"getIsAksCustomCloud": getIsAksCustomCloud,
"getCloudLocation": getCloudLocation,
}
}

Expand Down Expand Up @@ -538,11 +539,15 @@ func getIsAksCustomCloud(customCloudConfig *aksnodeconfigv1.CustomCloudConfig) b
return strings.EqualFold(customCloudConfig.GetCustomCloudEnvName(), helpers.AksCustomCloudName)
}

func getCloudLocation(v *aksnodeconfigv1.Configuration) string {
return strings.ToLower(strings.Join(strings.Fields(v.GetClusterConfig().GetLocation()), ""))
}

/* GetCloudTargetEnv determines and returns whether the region is a sovereign cloud which
have their own data compliance regulations (China/Germany/USGov) or standard. */
// Azure public cloud.
func getCloudTargetEnv(v *aksnodeconfigv1.Configuration) string {
loc := strings.ToLower(strings.Join(strings.Fields(v.GetClusterConfig().GetLocation()), ""))
loc := getCloudLocation(v)
switch {
case strings.HasPrefix(loc, "china"):
return "AzureChinaCloud"
Expand Down
1 change: 1 addition & 0 deletions aks-node-controller/parser/templates/cse_cmd.sh.gtpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ fi;
REPO_DEPOT_ENDPOINT="{{.CustomCloudConfig.RepoDepotEndpoint}}"
{{getInitAKSCustomCloudFilepath}} >> /var/log/azure/cluster-provision.log 2>&1;
{{end}}
LOCATION="{{getCloudLocation .}}"
Copy link

Copilot AI Mar 19, 2026

Choose a reason for hiding this comment

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

LOCATION="..." is not exported, and provision_start.sh is executed in a new /bin/bash -c process. As written, provision_start.sh will not receive LOCATION in its environment. If the intent is for downstream scripts to consume LOCATION (as the PR title/added specs suggest), change this to export the variable (or inline it into the bash -c command).

Suggested change
LOCATION="{{getCloudLocation .}}"
export LOCATION="{{getCloudLocation .}}"

Copilot uses AI. Check for mistakes.
/usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"
186 changes: 0 additions & 186 deletions parts/linux/cloud-init/artifacts/init-aks-custom-cloud-mariner.sh
View file
Open in desktop

This file was deleted.

Loading
Loading