Skip to content

Commit d374fcb

Browse files
authored
Merge pull request #5832 from nojnhuh/aso-sync
Bump installed ASO to v2.13.0
2 parents 51340ad + 89962ba commit d374fcb

File tree

3 files changed

+1306
-84
lines changed

3 files changed

+1306
-84
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ CRD_ROOT ?= $(MANIFEST_ROOT)/crd/bases
175175
WEBHOOK_ROOT ?= $(MANIFEST_ROOT)/webhook
176176
RBAC_ROOT ?= $(MANIFEST_ROOT)/rbac
177177
ASO_CRDS_PATH := $(MANIFEST_ROOT)/aso/crds.yaml
178-
ASO_VERSION := v2.11.0
178+
ASO_VERSION := $(shell go list -m -f '{{ .Version }}' github.com/Azure/azure-service-operator/v2)
179179
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
180180

181181
# Allow overriding the imagePullPolicy
@@ -572,6 +572,7 @@ generate-addons: fetch-calico-manifests ## Generate metric-server, calico, calic
572572
# envsubst, '$$$$' changes back to '$$' so ASO will not detect a diff and try to
573573
# update the CRDs for which we don't give it permission.
574574
generate-aso-crds: $(YQ)
575+
$(YQ) e -i '.resources[] |= sub("^(https://github\.com/Azure/azure-service-operator/releases/download/)[^/]+(/.*_).*(\.yaml)$$", "$${1}$(ASO_VERSION)$${2}$(ASO_VERSION)$${3}")' $(ROOT_DIR)/config/aso/kustomization.yaml
575576
curl -fSsL "https://github.com/Azure/azure-service-operator/releases/download/$(ASO_VERSION)/azureserviceoperator_customresourcedefinitions_$(ASO_VERSION).yaml" | \
576577
$(YQ) e '. | select($(foreach name,$(ASO_CRDS),.metadata.name == "$(name)" or )false)' - | \
577578
sed 's/\$$\$$/$$$$$$$$/g' \

0 commit comments

Comments
 (0)