Merge pull request #4973 from nojnhuh/asotwodoteight

bump ASO to v2.8.0

Author: k8s-ci-robot

.github/workflows/cover.yaml

@@ -21,7 +21,7 @@ jobs:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
       with:
-        go-version: '1.21'
+        go-version: '1.22'
     - run: "PATH=/usr/local/go/bin:$PATH make test-cover"
     - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
       env:

.github/workflows/dependabot-code-gen.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
       with:
-        go-version: '1.21'
+        go-version: '1.22'
       id: go
     - name: Check out code into the Go module directory
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

.github/workflows/scan.yml

@@ -22,6 +22,6 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: 1.21
+          go-version: 1.22
       - name: Run verify container script
         run: make verify-container-images

.golangci.yml

@@ -123,11 +123,11 @@ linters-settings:
         arguments:
           - disableStutteringCheck
   staticcheck:
-    go: "1.21"
+    go: "1.22"
   stylecheck:
-    go: "1.21"
+    go: "1.22"
   unused:
-    go: "1.21"
+    go: "1.22"
 
 issues:
   exclude-rules:

Dockerfile

@@ -18,7 +18,7 @@
 ARG ARCH
 
 # Build the manager binary
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 WORKDIR /workspace
 
 # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy

Makefile

@@ -165,7 +165,7 @@ CRD_ROOT ?= $(MANIFEST_ROOT)/crd/bases
 WEBHOOK_ROOT ?= $(MANIFEST_ROOT)/webhook
 RBAC_ROOT ?= $(MANIFEST_ROOT)/rbac
 ASO_CRDS_PATH := $(MANIFEST_ROOT)/aso/crds.yaml
-ASO_VERSION := v2.6.0
+ASO_VERSION := v2.8.0
 ASO_CRDS := resourcegroups.resources.azure.com natgateways.network.azure.com managedclusters.containerservice.azure.com managedclustersagentpools.containerservice.azure.com bastionhosts.network.azure.com virtualnetworks.network.azure.com virtualnetworkssubnets.network.azure.com privateendpoints.network.azure.com fleetsmembers.containerservice.azure.com extensions.kubernetesconfiguration.azure.com
 
 # Allow overriding the imagePullPolicy
@@ -393,7 +393,7 @@ delete-workload-cluster: $(KUBECTL) ## Deletes the example workload Kubernetes c
 .PHONY: docker-pull-prerequisites
 docker-pull-prerequisites: ## Pull prerequisites for building controller-manager.
 	docker pull docker/dockerfile:1.4
-	docker pull docker.io/library/golang:1.21
+	docker pull docker.io/library/golang:1.22
 	docker pull gcr.io/distroless/static:latest
 
 .PHONY: docker-build
@@ -647,7 +647,7 @@ release-binary: $(RELEASE_DIR) ## Compile and build release binaries.
 		-e GOARCH=$(GOARCH) \
 		-v "$$(pwd):/workspace" \
 		-w /workspace \
-		golang:1.21 \
+		golang:1.22 \
 		go build -a -ldflags '$(LDFLAGS) -extldflags "-static"' \
 		-o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(RELEASE_BINARY)
 

Tiltfile

@@ -126,7 +126,7 @@ def validate_auth():
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.21 as tilt-helper
+FROM golang:1.22 as tilt-helper
 # Support live reloading with Tilt
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh  && \
     wget --output-document /start.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/start.sh && \

config/aso/crds.yaml

@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 namespace: capz-system
 resources:
-- https://github.com/Azure/azure-service-operator/releases/download/v2.6.0/azureserviceoperator_v2.6.0.yaml
+- https://github.com/Azure/azure-service-operator/releases/download/v2.8.0/azureserviceoperator_v2.8.0.yaml
 - crds.yaml
 - settings.yaml
 
@@ -25,38 +25,17 @@ patches:
       name: azureserviceoperator-system
 - patch: |-
     - op: test
-      path: /spec/template/spec/containers/0/args/4
+      path: /spec/template/spec/containers/0/args/6
       value: --crd-pattern=
     - op: replace # Users can specify additional ASO CRDs. CRDs should be appended with ';'
-      path: /spec/template/spec/containers/0/args/4
+      path: /spec/template/spec/containers/0/args/6
       value: --crd-pattern=${ADDITIONAL_ASO_CRDS:= }
   target:
     group: apps
     kind: Deployment
     name: azureserviceoperator-controller-manager
     version: v1
 
-  # This implements https://github.com/Azure/azure-service-operator/pull/4011
-  # for versions of ASO which don't include that fix.
-- patch: |-
-    apiVersion: apps/v1
-    kind: Deployment
-    metadata:
-      name: azureserviceoperator-controller-manager
-      namespace: azureserviceoperator-system
-    spec:
-      template:
-        spec:
-          containers:
-            - name: manager
-              env:
-              - name: AZURE_USER_AGENT_SUFFIX
-                valueFrom:
-                  secretKeyRef:
-                    key: AZURE_USER_AGENT_SUFFIX
-                    name: aso-controller-settings
-                    optional: true
-
 replacements:
 - source:
     fieldPath: metadata.namespace

config/aso/kustomization.yaml

@@ -7,7 +7,7 @@ stringData:
   AZURE_AUTHORITY_HOST: ${AZURE_AUTHORITY_HOST:=""}
   AZURE_RESOURCE_MANAGER_ENDPOINT: ${AZURE_RESOURCE_MANAGER_ENDPOINT:=""}
   AZURE_RESOURCE_MANAGER_AUDIENCE: ${AZURE_RESOURCE_MANAGER_AUDIENCE:=""}
-  AZURE_SYNC_PERIOD: ${AZURE_SYNC_PERIOD:="1h"}
+  AZURE_SYNC_PERIOD: ${AZURE_SYNC_PERIOD:=""}
   AZURE_USER_AGENT_SUFFIX: cluster-api-provider-azure/main
   # Per-resource Secrets will be created based on a Cluster's AzureClusterIdentity.
   AZURE_SUBSCRIPTION_ID: ""