Skip to content

fix(templatize): adapt IstioUpgrade step for ARO-Tools Value aksCluster #6201

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 3 commits into from
Jul 22, 2026
Merged

fix(templatize): adapt IstioUpgrade step for ARO-Tools Value aksCluster #6201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f1c426
fix(templatize): adapt IstioUpgrade step for ARO-Tools Value aksCluster
trevorwilliams2025 Jul 21, 2026
2cc4cb2
fix(templatize): complete IstioUpgrade aksCluster Value resolution
trevorwilliams2025 Jul 22, 2026
bc01b7d
fix(templatize): complete pipelines go.sum entries for tidy verify
trevorwilliams2025 Jul 22, 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
2 changes: 1 addition & 1 deletion test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ require (
cloud.google.com/go/monitoring v1.24.3 // indirect
cloud.google.com/go/storage v1.62.1 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260715002326-2555e1130350 // indirect
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260720175808-ca2cea2cb707 // indirect
github.com/Azure/ARO-Tools/tools/cmdutils v0.0.0-20260715002326-2555e1130350 // indirect
github.com/Azure/ARO-Tools/tools/grafanactl v0.0.0-20260715002326-2555e1130350 // indirect
github.com/Azure/ARO-Tools/tools/helm v0.0.0-20260715002326-2555e1130350 // indirect
Expand Down
4 changes: 2 additions & 2 deletions test/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ github.com/Azure/ARO-HCP/backend v0.0.0-20260513195720-7c0637c01c58 h1:GS9DvICq1
github.com/Azure/ARO-HCP/backend v0.0.0-20260513195720-7c0637c01c58/go.mod h1:/0GqqOcoDf58ozMxUvx2BN8i9KUN28EzhNdpTMSejW8=
github.com/Azure/ARO-Tools/config v0.0.0-20260715002326-2555e1130350 h1:HcxeG/aUrC+dEQHQuUAFuWeUjrInvtoLg4VZoB27WpI=
github.com/Azure/ARO-Tools/config v0.0.0-20260715002326-2555e1130350/go.mod h1:lHUKixOUw8Wn/x3JC7VVLwlGDC4hD4wTUfYbT249yKM=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260715002326-2555e1130350 h1:WkyGoNXxBikToHAKiKwmPyfCmuyQR/D/0w4e2ko+63Y=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260715002326-2555e1130350/go.mod h1:WPsexqTqWP0/yJTOXhvVMfTrK73SXofVUE0XMudAnt8=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260720175808-ca2cea2cb707 h1:0WvIjAhHuy9fwjUbHcQX3MoyiQgGgh9dr95N7SfkY40=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260720175808-ca2cea2cb707/go.mod h1:WPsexqTqWP0/yJTOXhvVMfTrK73SXofVUE0XMudAnt8=
github.com/Azure/ARO-Tools/testutil v0.0.0-20260715002326-2555e1130350 h1:BT7jXSF8pldP/zgiMAHXajS9d1crVlZYqyT3kyK/YBA=
github.com/Azure/ARO-Tools/testutil v0.0.0-20260715002326-2555e1130350/go.mod h1:vKa6bvu+tFVip4oWO9PNI2NbtmN1KUezvdX7rZCQtQU=
github.com/Azure/ARO-Tools/tools/cmdutils v0.0.0-20260715002326-2555e1130350 h1:OKEEHnv7jJhynBgOkRTTNvKt2Nq5KyiCAeu9kx+RM24=
Expand Down
2 changes: 1 addition & 1 deletion tooling/helmtest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.25.7

require (
github.com/Azure/ARO-Tools/config v0.0.0-20260715002326-2555e1130350
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260715002326-2555e1130350
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260720175808-ca2cea2cb707
github.com/Azure/ARO-Tools/testutil v0.0.0-20260715002326-2555e1130350
github.com/google/go-cmp v0.7.0
github.com/stretchr/testify v1.11.1
Expand Down
4 changes: 2 additions & 2 deletions tooling/helmtest/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
github.com/Azure/ARO-Tools/config v0.0.0-20260715002326-2555e1130350 h1:HcxeG/aUrC+dEQHQuUAFuWeUjrInvtoLg4VZoB27WpI=
github.com/Azure/ARO-Tools/config v0.0.0-20260715002326-2555e1130350/go.mod h1:lHUKixOUw8Wn/x3JC7VVLwlGDC4hD4wTUfYbT249yKM=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260715002326-2555e1130350 h1:WkyGoNXxBikToHAKiKwmPyfCmuyQR/D/0w4e2ko+63Y=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260715002326-2555e1130350/go.mod h1:WPsexqTqWP0/yJTOXhvVMfTrK73SXofVUE0XMudAnt8=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260720175808-ca2cea2cb707 h1:0WvIjAhHuy9fwjUbHcQX3MoyiQgGgh9dr95N7SfkY40=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260720175808-ca2cea2cb707/go.mod h1:WPsexqTqWP0/yJTOXhvVMfTrK73SXofVUE0XMudAnt8=
github.com/Azure/ARO-Tools/testutil v0.0.0-20260715002326-2555e1130350 h1:BT7jXSF8pldP/zgiMAHXajS9d1crVlZYqyT3kyK/YBA=
github.com/Azure/ARO-Tools/testutil v0.0.0-20260715002326-2555e1130350/go.mod h1:vKa6bvu+tFVip4oWO9PNI2NbtmN1KUezvdX7rZCQtQU=
github.com/Azure/ARO-Tools/tools/cmdutils v0.0.0-20260715002326-2555e1130350 h1:OKEEHnv7jJhynBgOkRTTNvKt2Nq5KyiCAeu9kx+RM24=
Expand Down
2 changes: 1 addition & 1 deletion tooling/pipeline-documentation/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/Azure/ARO-HCP/tooling/pipeline-documentation
go 1.25.7

require (
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260715002326-2555e1130350
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260720175808-ca2cea2cb707
github.com/dusted-go/logging v1.3.0
Comment thread
trevorwilliams2025 marked this conversation as resolved.
github.com/go-logr/logr v1.4.3
github.com/spf13/cobra v1.10.2
Expand Down
4 changes: 2 additions & 2 deletions tooling/pipeline-documentation/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260715002326-2555e1130350 h1:WkyGoNXxBikToHAKiKwmPyfCmuyQR/D/0w4e2ko+63Y=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260715002326-2555e1130350/go.mod h1:WPsexqTqWP0/yJTOXhvVMfTrK73SXofVUE0XMudAnt8=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260720175808-ca2cea2cb707 h1:0WvIjAhHuy9fwjUbHcQX3MoyiQgGgh9dr95N7SfkY40=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260720175808-ca2cea2cb707/go.mod h1:WPsexqTqWP0/yJTOXhvVMfTrK73SXofVUE0XMudAnt8=
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
github.com/dusted-go/logging v1.3.0 h1:SL/EH1Rp27oJQIte+LjWvWACSnYDTqNx5gZULin0XRY=
github.com/dusted-go/logging v1.3.0/go.mod h1:s58+s64zE5fxSWWZfp+b8ZV0CHyKHjamITGyuY1wzGg=
Expand Down
2 changes: 1 addition & 1 deletion tooling/templatize/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.25.7
require (
github.com/Azure/ARO-HCP/tooling/cleanup-sweeper v0.0.0-20260409032928-501433c68f7d
github.com/Azure/ARO-Tools/config v0.0.0-20260715002326-2555e1130350
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260715002326-2555e1130350
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260720175808-ca2cea2cb707
github.com/Azure/ARO-Tools/testutil v0.0.0-20260715002326-2555e1130350
github.com/Azure/ARO-Tools/tools/cmdutils v0.0.0-20260715002326-2555e1130350
github.com/Azure/ARO-Tools/tools/grafanactl v0.0.0-20260715002326-2555e1130350
Expand Down
4 changes: 2 additions & 2 deletions tooling/templatize/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ github.com/Azure/ARO-HCP/tooling/cleanup-sweeper v0.0.0-20260409032928-501433c68
github.com/Azure/ARO-HCP/tooling/cleanup-sweeper v0.0.0-20260409032928-501433c68f7d/go.mod h1:rVUpgSjxc+ODZ9g745QpuCtC/UqNk1Q2bYBHqtwH43A=
github.com/Azure/ARO-Tools/config v0.0.0-20260715002326-2555e1130350 h1:HcxeG/aUrC+dEQHQuUAFuWeUjrInvtoLg4VZoB27WpI=
github.com/Azure/ARO-Tools/config v0.0.0-20260715002326-2555e1130350/go.mod h1:lHUKixOUw8Wn/x3JC7VVLwlGDC4hD4wTUfYbT249yKM=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260715002326-2555e1130350 h1:WkyGoNXxBikToHAKiKwmPyfCmuyQR/D/0w4e2ko+63Y=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260715002326-2555e1130350/go.mod h1:WPsexqTqWP0/yJTOXhvVMfTrK73SXofVUE0XMudAnt8=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260720175808-ca2cea2cb707 h1:0WvIjAhHuy9fwjUbHcQX3MoyiQgGgh9dr95N7SfkY40=
github.com/Azure/ARO-Tools/pipelines v0.0.0-20260720175808-ca2cea2cb707/go.mod h1:WPsexqTqWP0/yJTOXhvVMfTrK73SXofVUE0XMudAnt8=
github.com/Azure/ARO-Tools/testutil v0.0.0-20260715002326-2555e1130350 h1:BT7jXSF8pldP/zgiMAHXajS9d1crVlZYqyT3kyK/YBA=
github.com/Azure/ARO-Tools/testutil v0.0.0-20260715002326-2555e1130350/go.mod h1:vKa6bvu+tFVip4oWO9PNI2NbtmN1KUezvdX7rZCQtQU=
github.com/Azure/ARO-Tools/tools/cmdutils v0.0.0-20260715002326-2555e1130350 h1:OKEEHnv7jJhynBgOkRTTNvKt2Nq5KyiCAeu9kx+RM24=
Expand Down
21 changes: 16 additions & 5 deletions tooling/templatize/pkg/pipeline/istio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,27 @@ func configString(val any) string {
return fmt.Sprintf("%v", val)
}

func runIstioUpgradeStep(id graph.Identifier, step *types.IstioUpgradeStep, ctx context.Context, options *StepRunOptions, executionTarget ExecutionTarget) error {
func runIstioUpgradeStep(id graph.Identifier, step *types.IstioUpgradeStep, ctx context.Context, options *StepRunOptions, executionTarget ExecutionTarget, state *ExecutionState) error {
logger := logr.FromContextOrDiscard(ctx).WithValues("stepID", id)

kubeconfigFile, err := KubeConfig(ctx, executionTarget.GetSubscriptionID(), executionTarget.GetResourceGroup(), step.AKSCluster)
state.RLock()
outputs := state.GetOutputs(id.Stamp)
state.RUnlock()

clusterName, err := resolveValue(step.AKSCluster, options.Configuration, outputs, id.ServiceGroup)
if err != nil {
return fmt.Errorf("failed to resolve aksCluster: %w", err)
}
if clusterName == "" {
return fmt.Errorf("aksCluster resolved to an empty value")
}

kubeconfigFile, err := KubeConfig(ctx, executionTarget.GetSubscriptionID(), executionTarget.GetResourceGroup(), clusterName)
if err != nil {
return fmt.Errorf("failed to prepare kubeconfig: %w", err)
}
if kubeconfigFile == "" {
return fmt.Errorf("kubeconfig resolved to empty path for cluster %s", step.AKSCluster)
return fmt.Errorf("kubeconfig resolved to empty path for cluster %s", clusterName)
}
defer func() {
if err := os.Remove(kubeconfigFile); err != nil {
Expand Down Expand Up @@ -83,13 +95,12 @@ func runIstioUpgradeStep(id graph.Identifier, step *types.IstioUpgradeStep, ctx

opts := istio.DefaultUpgradeOptions()
opts.ResourceGroup = executionTarget.GetResourceGroup()
opts.ClusterName = step.AKSCluster
opts.ClusterName = clusterName
opts.KubeconfigPath = kubeconfigFile
opts.Versions = configString(versions)
opts.Tag = configString(tag)
opts.IngressIPName = configString(ipName)
opts.RegionRG = configString(regionRG)
opts.DryRun = step.DryRun

return istio.RunUpgrade(ctx, opts, aksClient, kubeClient)
}
2 changes: 1 addition & 1 deletion tooling/templatize/pkg/pipeline/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,7 @@ func RunStep(id graph.Identifier, s types.Step, ctx context.Context, executionTa
}
return output, details, nil
case *types.IstioUpgradeStep:
if err := runIstioUpgradeStep(id, step, ctx, options, executionTarget); err != nil {
if err := runIstioUpgradeStep(id, step, ctx, options, executionTarget, state); err != nil {
return nil, nil, fmt.Errorf("failed to run istio upgrade step: %w", err)
}
return nil, nil, nil
Expand Down