Skip to content

Commit a5a998d

Browse files
theunrepentantgeektheunrepentantgeek
committed
Merge branch 'main' into copilot/fix-3338
2 parents 8796d6e + 9dfc3d3 commit a5a998d

File tree

591 files changed

+78846
-2887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

591 files changed

+78846
-2887
lines changed

‎.devcontainer/install-dependencies.sh‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -185,22 +185,22 @@ go-install() {
185185
fi
186186
}
187187

188-
#doc# | conversion-gen | v0.33.0 | https://pkg.go.dev/k8s.io/code-generator/cmd/conversion-gen |
189-
go-install conversion-gen k8s.io/code-generator/cmd/conversion-gen@v0.33.0
188+
#doc# | conversion-gen | v0.34.1 | https://pkg.go.dev/k8s.io/code-generator/cmd/conversion-gen |
189+
go-install conversion-gen k8s.io/code-generator/cmd/conversion-gen@v0.34.1
190190

191-
#doc# | controller-gen | v0.17.3 | https://book.kubebuilder.io/reference/controller-gen |
192-
go-install controller-gen sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.3
191+
#doc# | controller-gen | v0.19.0 | https://book.kubebuilder.io/reference/controller-gen |
192+
go-install controller-gen sigs.k8s.io/controller-tools/cmd/controller-gen@v0.19.0
193193

194-
#doc# | kind | v0.27.0 | https://kind.sigs.k8s.io/ |
195-
go-install kind sigs.k8s.io/kind@v0.27.0
194+
#doc# | kind | v0.30.0 | https://kind.sigs.k8s.io/ |
195+
go-install kind sigs.k8s.io/kind@v0.30.0
196196

197197
#doc# | kustomize | v4.5.7 | https://kustomize.io/ |
198198
go-install kustomize sigs.k8s.io/kustomize/kustomize/[email protected]
199199

200200
# for docs site
201201

202-
#doc# | hugo | v0.147.0 | https://gohugo.io/ |
203-
go-install hugo -tags extended github.com/gohugoio/hugo@v0.147.0
202+
#doc# | hugo | v0.152.2 | https://gohugo.io/ |
203+
go-install hugo -tags extended github.com/gohugoio/hugo@v0.152.2
204204

205205
#doc# | htmltest | latest | https://github.com/wjdp/htmltest (but see https://github.com/theunrepentantgeek/htmltest for our custom build )
206206
# Restore this to github.com/wjdp/htmltest@v?? once PR#215 is merged with the feature we need
@@ -210,11 +210,11 @@ go-install htmltest github.com/theunrepentantgeek/htmltest@latest
210210
go-install crddoc github.com/theunrepentantgeek/crddoc@latest
211211

212212
# Install envtest tooling
213-
#doc# | setup-envtest | v0.20.4 | https://book.kubebuilder.io/reference/envtest.html |
213+
#doc# | setup-envtest | v0.22.4 | https://book.kubebuilder.io/reference/envtest.html |
214214
write-verbose "Checking for $TOOL_DEST/setup-envtest"
215215
if should-install "$TOOL_DEST/setup-envtest"; then
216216
write-info "Installing setup-envtest"
217-
curl -sL "https://github.com/kubernetes-sigs/controller-runtime/releases/download/v0.20.4/setup-envtest-${os}-${arch}" --output "$TOOL_DEST/setup-envtest"
217+
curl -sL "https://github.com/kubernetes-sigs/controller-runtime/releases/download/v0.22.4/setup-envtest-${os}-${arch}" --output "$TOOL_DEST/setup-envtest"
218218
chmod +x "$TOOL_DEST/setup-envtest"
219219
fi
220220

@@ -223,48 +223,49 @@ fi
223223
go-install gofumpt mvdan.cc/gofumpt@latest
224224

225225
# Install golangci-lint
226-
#doc# | golangci-lint | 2.3.1 | https://github.com/golangci/golangci-lint |
226+
#doc# | golangci-lint | 2.6.1 | https://github.com/golangci/golangci-lint |
227227
write-verbose "Checking for $TOOL_DEST/golangci-lint"
228228
if should-install "$TOOL_DEST/golangci-lint"; then
229229
write-info "Installing golangci-lint"
230230
# golangci-lint is provided by base image if in devcontainer
231231
# this command copied from there
232-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$TOOL_DEST" v2.3.1 2>&1
232+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$TOOL_DEST" v2.6.1 2>&1
233233
fi
234234

235235
# Install Task
236-
#doc# | Task | v3.43.3 | https://taskfile.dev/ |
236+
#doc# | Task | v3.44.0 | https://taskfile.dev/ |
237+
# not using 3.44.1+ due to https://github.com/go-task/task/issues/2355
237238
write-verbose "Checking for $TOOL_DEST/go-task"
238239
if should-install "$TOOL_DEST/task"; then
239240
write-info "Installing go-task"
240-
curl -sL "https://github.com/go-task/task/releases/download/v3.43.3/task_${os}_${arch}.tar.gz" | tar xz -C "$TOOL_DEST" task
241+
curl -sL "https://github.com/go-task/task/releases/download/v3.44.0/task_${os}_${arch}.tar.gz" | tar xz -C "$TOOL_DEST" task
241242
fi
242243

243244
# Install Trivy
244-
#doc# | Trivy | v0.55.2 | https://trivy.dev/ |
245+
#doc# | Trivy | v0.67.2 | https://trivy.dev/ |
245246
write-verbose "Checking for $TOOL_DEST/trivy"
246247
if should-install "$TOOL_DEST/trivy"; then
247248
write-info "Installing trivy"
248249
# This guys decided to use different naming conventions for os(go env GOOS) and arch(go env GOARCH) despite trivy is 98.6% written in Go
249250
# This fixes macos arm64 architechture. Every other os/arch is named differently. Consider adding a workaround of your own ¯\_(ツ)_/¯
250251
if [[ ${os} == "darwin" ]] && [[ ${arch} == "arm64" ]]; then
251-
curl -sL "https://github.com/aquasecurity/trivy/releases/download/v0.55.2/trivy_0.55.2_macOS-ARM64.tar.gz" | tar xz -C "$TOOL_DEST" trivy
252+
curl -sL "https://github.com/aquasecurity/trivy/releases/download/v0.67.2/trivy_0.67.2_macOS-ARM64.tar.gz" | tar xz -C "$TOOL_DEST" trivy
252253
else
253-
curl -sL "https://github.com/aquasecurity/trivy/releases/download/v0.55.2/trivy_0.55.2_Linux-64bit.tar.gz" | tar xz -C "$TOOL_DEST" trivy
254+
curl -sL "https://github.com/aquasecurity/trivy/releases/download/v0.67.2/trivy_0.67.2_Linux-64bit.tar.gz" | tar xz -C "$TOOL_DEST" trivy
254255
fi
255256
fi
256257

257258
# Install helm
258-
#doc# | Helm | v3.16.1 | https://helm.sh/ |
259+
#doc# | Helm | v3.19.0 | https://helm.sh/ |
259260
write-verbose "Checking for $TOOL_DEST/helm"
260261
if should-install "$TOOL_DEST/helm"; then
261262
write-info "Installing helm..."
262-
curl -sL "https://get.helm.sh/helm-v3.16.1-${os}-${arch}.tar.gz" | tar -C "$TOOL_DEST" --strip-components=1 -xz ${os}-${arch}/helm
263+
curl -sL "https://get.helm.sh/helm-v3.19.0-${os}-${arch}.tar.gz" | tar -C "$TOOL_DEST" --strip-components=1 -xz ${os}-${arch}/helm
263264
fi
264265

265266
# Install yq
266-
#doc# | YQ | v4.44.3 | https://github.com/mikefarah/yq/ |
267-
yq_version=v4.44.3
267+
#doc# | YQ | v4.48.1 | https://github.com/mikefarah/yq/ |
268+
yq_version=v4.48.1
268269
yq_binary=yq_${os}_${arch}
269270
write-verbose "Checking for $TOOL_DEST/yq"
270271
if should-install "$TOOL_DEST/yq"; then
@@ -283,24 +284,24 @@ if should-install "$TOOL_DEST/cmctl"; then
283284
fi
284285

285286
write-verbose "Checking for $BUILDX_DEST/docker-buildx"
286-
#doc# | BuildX | v0.17.1 | https://github.com/docker/buildx |
287+
#doc# | BuildX | v0.29.1 | https://github.com/docker/buildx |
287288
if should-install "$BUILDX_DEST/docker-buildx"; then
288289
write-info "Installing buildx-${os}_${arch} to $BUILDX_DEST ..."
289290
if ! test -f $BUILDX_DEST; then
290291
mkdir -p "$BUILDX_DEST"
291292
fi
292293
if ! test -f $BUILDX_DEST/docker-buildx; then
293-
curl -o "$BUILDX_DEST/docker-buildx" -L "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.${os}-${arch}"
294+
curl -o "$BUILDX_DEST/docker-buildx" -L "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.${os}-${arch}"
294295
chmod +x "$BUILDX_DEST/docker-buildx"
295296
fi
296297
fi
297298

298299
# Install azwi
299-
#doc# | AZWI | v1.2.0 | https://github.com/Azure/azure-workload-identity |
300+
#doc# | AZWI | v1.5.1 | https://github.com/Azure/azure-workload-identity |
300301
write-verbose "Checking for $TOOL_DEST/azwi"
301302
if should-install "$TOOL_DEST/azwi"; then
302303
write-info "Installing azwi..."
303-
curl -sL "https://github.com/Azure/azure-workload-identity/releases/download/v1.3.0/azwi-v1.3.0-${os}-${arch}.tar.gz" | tar xz -C "$TOOL_DEST" azwi
304+
curl -sL "https://github.com/Azure/azure-workload-identity/releases/download/v1.5.1/azwi-v1.5.1-${os}-${arch}.tar.gz" | tar xz -C "$TOOL_DEST" azwi
304305
fi
305306

306307
# Ensure tooling for Hugo is available

‎Taskfile.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ tasks:
718718
- generator:build
719719
sources:
720720
- ./bin/{{.GENERATOR_APP}}
721-
- v2/azure-arm.yaml
721+
- azure-arm.yaml
722722
- ../docs/hugo/content/reference
723723
cmds:
724724
- ./bin/{{.GENERATOR_APP}} gen-types azure-arm.yaml

‎docs/hugo/content/blogs/release-notes-v2.16.0.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: "ASO v2.16 Release Notes"
33
date: 2025-10-29
44
description: "Release notes for Azure Service Operator v2.16.0"
5+
type: blog
56
---
67

78
We're excited to announce the release of Azure Service Operator v2.16.0! This release comes with a host of improvements and fixes, along with support being added for some oft-requested resources.

‎docs/hugo/content/contributing/aso-codegen-structure.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎docs/hugo/content/contributing/aso-v2-structure.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎docs/hugo/content/contributing/asoctl-structure.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎docs/hugo/content/contributing/dependencies.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ If you prefer to install those dependencies manually (instead of using the `.dev
99
| Dependency | Version | Reference |
1010
|:---------- |:-------:|:--------- |
1111
| AZ | latest | https://docs.microsoft.com/en-us/cli/azure/install-azure-cli |
12-
| AZWI | v1.2.0 | https://github.com/Azure/azure-workload-identity |
13-
| BuildX | v0.17.1 | https://github.com/docker/buildx |
12+
| AZWI | v1.5.1 | https://github.com/Azure/azure-workload-identity |
13+
| BuildX | v0.29.1 | https://github.com/docker/buildx |
1414
| cmctl | latest | https://cert-manager.io/docs/reference/cmctl |
15-
| controller-gen | v0.17.3 | https://book.kubebuilder.io/reference/controller-gen |
16-
| conversion-gen | v0.33.0 | https://pkg.go.dev/k8s.io/code-generator/cmd/conversion-gen |
15+
| controller-gen | v0.19.0 | https://book.kubebuilder.io/reference/controller-gen |
16+
| conversion-gen | v0.34.1 | https://pkg.go.dev/k8s.io/code-generator/cmd/conversion-gen |
1717
| crddoc | latest | https://github.com/theunrepentantgeek/crddoc |
1818
| Go | 1.23 | https://golang.org/doc/install #
1919
| gofumpt | latest | https://pkg.go.dev/mvdan.cc/gofumpt |
20-
| golangci-lint | 2.3.1 | https://github.com/golangci/golangci-lint |
21-
| Helm | v3.16.1 | https://helm.sh/ |
20+
| golangci-lint | 2.6.1 | https://github.com/golangci/golangci-lint |
21+
| Helm | v3.19.0 | https://helm.sh/ |
2222
| htmltest | latest | https://github.com/wjdp/htmltest (but see https://github.com/theunrepentantgeek/htmltest for our custom build )
23-
| hugo | v0.147.0 | https://gohugo.io/ |
24-
| kind | v0.27.0 | https://kind.sigs.k8s.io/ |
23+
| hugo | v0.152.2 | https://gohugo.io/ |
24+
| kind | v0.30.0 | https://kind.sigs.k8s.io/ |
2525
| kustomize | v4.5.7 | https://kustomize.io/ |
2626
| Pip3 | latest | https://pip.pypa.io/en/stable/installation/ |
2727
| PostCSS | latest | https://postcss.org/ |
28-
| setup-envtest | v0.20.4 | https://book.kubebuilder.io/reference/envtest.html |
29-
| Task | v3.43.3 | https://taskfile.dev/ |
30-
| Trivy | v0.55.2 | https://trivy.dev/ |
31-
| YQ | v4.44.3 | https://github.com/mikefarah/yq/ |
28+
| setup-envtest | v0.22.4 | https://book.kubebuilder.io/reference/envtest.html |
29+
| Task | v3.44.0 | https://taskfile.dev/ |
30+
| Trivy | v0.67.2 | https://trivy.dev/ |
31+
| YQ | v4.48.1 | https://github.com/mikefarah/yq/ |
3232

3333
Dependencies are listed alphabetically. Refer to `install-dependencies.sh` for a recommended order of installation.
3434

‎docs/hugo/content/reference/_index.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,21 @@ These are older versions of resources still available for use in the current rel
431431

432432
To install the CRDs for these resources, your ASO configuration must include `dbforpostgresql.azure.com/*` as one of the configured CRD patterns. See [CRD Management in ASO](https://azure.github.io/azure-service-operator/guide/crd-management/) for details on doing this for both [Helm](https://azure.github.io/azure-service-operator/guide/crd-management/#helm) and [YAML](https://azure.github.io/azure-service-operator/guide/crd-management/#yaml) based installations.
433433

434+
### Next Release
435+
436+
Development of these new resources is complete and they will be available in the next release of ASO.
437+
438+
| Resource | ARM Version | CRD Version | Supported From | Sample |
439+
|-------------------------------------------------|-------------|-------------|----------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
440+
| FlexibleServer | 2025-08-01 | v20250801 | v2.17.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbforpostgresql/v20250801/v20250801_flexibleserver.yaml) |
441+
| FlexibleServersAdministrator | 2025-08-01 | v20250801 | v2.17.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbforpostgresql/v20250801/v20250801_flexibleserversadministrator.yaml) |
442+
| FlexibleServersAdvancedThreatProtectionSettings | 2025-08-01 | v20250801 | v2.17.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbforpostgresql/v20250801/v20250801_flexibleserversadvancedthreatprotectionsettings.yaml) |
443+
| FlexibleServersBackup | 2025-08-01 | v20250801 | v2.17.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbforpostgresql/v20250801/v20250801_flexibleserversbackup.yaml) |
444+
| FlexibleServersConfiguration | 2025-08-01 | v20250801 | v2.17.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbforpostgresql/v20250801/v20250801_flexibleserversconfiguration.yaml) |
445+
| FlexibleServersDatabase | 2025-08-01 | v20250801 | v2.17.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbforpostgresql/v20250801/v20250801_flexibleserversdatabase.yaml) |
446+
| FlexibleServersFirewallRule | 2025-08-01 | v20250801 | v2.17.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbforpostgresql/v20250801/v20250801_flexibleserversfirewallrule.yaml) |
447+
| FlexibleServersVirtualEndpoint | 2025-08-01 | v20250801 | v2.17.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/dbforpostgresql/v20250801/v20250801_flexibleserversvirtualendpoint.yaml) |
448+
434449
### Latest Released Versions
435450

436451
These resource(s) are the latest versions available for use in the current release of ASO. Different versions of a given resource reflect different versions of the Azure ARM API.

‎docs/hugo/content/reference/alertsmanagement/v1api20210401.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ APIVersion{#APIVersion}
1515
SmartDetectorAlertRule{#SmartDetectorAlertRule}
1616
-----------------------------------------------
1717

18-
Generator information: - Generated from: /alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2021-04-01/SmartDetectorAlertRulesApi.json - ARM URI: /​subscriptions/​{subscriptionId}/​resourceGroups/​{resourceGroupName}/​providers/​microsoft.alertsManagement/​smartDetectorAlertRules/​{alertRuleName}
18+
Generator information: - Generated from: /alertsmanagement/resource-manager/Microsoft.AlertsManagement/AlertsManagement/stable/2021-04-01/SmartDetectorAlertRulesApi.json - ARM URI: /​subscriptions/​{subscriptionId}/​resourceGroups/​{resourceGroupName}/​providers/​microsoft.alertsManagement/​smartDetectorAlertRules/​{alertRuleName}
1919

2020
Used by: [SmartDetectorAlertRuleList](#SmartDetectorAlertRuleList).
2121

@@ -66,7 +66,7 @@ Used by: [SmartDetectorAlertRuleList](#SmartDetectorAlertRuleList).
6666
SmartDetectorAlertRuleList{#SmartDetectorAlertRuleList}
6767
-------------------------------------------------------
6868

69-
Generator information: - Generated from: /alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2021-04-01/SmartDetectorAlertRulesApi.json - ARM URI: /​subscriptions/​{subscriptionId}/​resourceGroups/​{resourceGroupName}/​providers/​microsoft.alertsManagement/​smartDetectorAlertRules/​{alertRuleName}
69+
Generator information: - Generated from: /alertsmanagement/resource-manager/Microsoft.AlertsManagement/AlertsManagement/stable/2021-04-01/SmartDetectorAlertRulesApi.json - ARM URI: /​subscriptions/​{subscriptionId}/​resourceGroups/​{resourceGroupName}/​providers/​microsoft.alertsManagement/​smartDetectorAlertRules/​{alertRuleName}
7070

7171
| Property | Description | Type |
7272
|-------------------------------------------------------------------------------------|-------------|---------------------------------------------------------------------------------|

‎docs/hugo/content/reference/alertsmanagement/v1api20230301.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ APIVersion{#APIVersion}
1515
PrometheusRuleGroup{#PrometheusRuleGroup}
1616
-----------------------------------------
1717

18-
Generator information: - Generated from: /alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/PrometheusRuleGroups.json - ARM URI: /​subscriptions/​{subscriptionId}/​resourceGroups/​{resourceGroupName}/​providers/​Microsoft.AlertsManagement/​prometheusRuleGroups/​{ruleGroupName}
18+
Generator information: - Generated from: /alertsmanagement/resource-manager/Microsoft.AlertsManagement/AlertsManagement/stable/2023-03-01/PrometheusRuleGroups.json - ARM URI: /​subscriptions/​{subscriptionId}/​resourceGroups/​{resourceGroupName}/​providers/​Microsoft.AlertsManagement/​prometheusRuleGroups/​{ruleGroupName}
1919

2020
Used by: [PrometheusRuleGroupList](#PrometheusRuleGroupList).
2121

@@ -63,7 +63,7 @@ Used by: [PrometheusRuleGroupList](#PrometheusRuleGroupList).
6363
PrometheusRuleGroupList{#PrometheusRuleGroupList}
6464
-------------------------------------------------
6565

66-
Generator information: - Generated from: /alertsmanagement/resource-manager/Microsoft.AlertsManagement/stable/2023-03-01/PrometheusRuleGroups.json - ARM URI: /​subscriptions/​{subscriptionId}/​resourceGroups/​{resourceGroupName}/​providers/​Microsoft.AlertsManagement/​prometheusRuleGroups/​{ruleGroupName}
66+
Generator information: - Generated from: /alertsmanagement/resource-manager/Microsoft.AlertsManagement/AlertsManagement/stable/2023-03-01/PrometheusRuleGroups.json - ARM URI: /​subscriptions/​{subscriptionId}/​resourceGroups/​{resourceGroupName}/​providers/​Microsoft.AlertsManagement/​prometheusRuleGroups/​{ruleGroupName}
6767

6868
| Property | Description | Type |
6969
|-------------------------------------------------------------------------------------|-------------|---------------------------------------------------------------------------|

0 commit comments

Comments
 (0)