Skip to content

Commit 403c964

Browse files
GeraldLoefflertheunrepentantgeek
GeraldLoeffler
and
theunrepentantgeek
authored
added app/v1api20250101 (#4858)
* added app/v1api20250101 * added integration tests; reverted Taskfile.yml * Add test recordings * Update recordings * Increase CI timeouts * Test sample * Don't use coverage for integration tests --------- Co-authored-by: Bevan Arps <bevan.arps@microsoft.com>
1 parent f053a3e commit 403c964

File tree

84 files changed

+175230
-4700
lines changed

Some content is hidden

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

84 files changed

+175230
-4700
lines changed

‎Taskfile.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ tasks:
190190
desc: Run {{.ASOCTL_APP}} fast lint checks.
191191
dir: '{{.ASOCTL_ROOT}}'
192192
cmds:
193-
- golangci-lint run --verbose --fix --timeout 5m ./...
193+
- golangci-lint run --verbose --fix --timeout 10m ./...
194194

195195
asoctl:build:
196196
desc: Generate the {{.ASOCTL_APP}} binary.
@@ -582,7 +582,7 @@ tasks:
582582
vars:
583583
VERBOSE:
584584
sh: if [ $TEST_FILTER ]; then echo "-v"; fi
585-
TIMEOUT: '{{default "20m" .TIMEOUT}}' # Should be kept in sync with the -cover variant below
585+
TIMEOUT: '{{default "25m" .TIMEOUT}}' # Should be kept in sync with the -cover variant below
586586

587587
# This target is intended for local use only
588588
controller:test-integration-envtest-record:
@@ -624,7 +624,7 @@ tasks:
624624
- go test -covermode atomic -coverprofile='{{.TEST_OUT}}/coverage-integration-genruntime-envtest.out' -coverpkg="./..." -json -timeout {{.TIMEOUT}} -run '{{default ".*" .TEST_FILTER}}' ./pkg/genruntime/test > '{{.TEST_OUT}}/controller-integration-genruntime-tests.json'
625625
- go test -covermode atomic -coverprofile='{{.TEST_OUT}}/coverage-integration-genericarmclient-envtest.out' -coverpkg="./..." -json -timeout {{.TIMEOUT}} -run '{{default ".*" .TEST_FILTER}}' ./internal/genericarmclient > '{{.TEST_OUT}}/controller-integration-genericarmclient-tests.json'
626626
vars:
627-
TIMEOUT: '20m' # Should be kept in sync with the non-cover variant above
627+
TIMEOUT: '25m' # Should be kept in sync with the non-cover variant above
628628

629629
controller:test-integration-envtest-live:
630630
desc: Run integration tests with envtest against live data and output coverage.
@@ -693,7 +693,7 @@ tasks:
693693
desc: Run integration tests for CI
694694
dir: "{{.CONTROLLER_ROOT}}"
695695
deps:
696-
- controller:test-integration-envtest-cover
696+
- controller:test-integration-envtest
697697

698698
controller:test-integration-ci-live:
699699
desc: Run integration tests for CI in live mode

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,17 @@ These are older versions of resources still available for use in the current rel
7474

7575
To install the CRDs for these resources, your ASO configuration must include `app.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.
7676

77+
### Next Release
78+
79+
Development of these new resources is complete and they will be available in the next release of ASO.
80+
81+
| Resource | ARM Version | CRD Version | Supported From | Sample |
82+
|--------------------|-------------|---------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------|
83+
| AuthConfig | 2025-01-01 | v1api20250101 | v2.15.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/app/v1api20250101/v1api20250101_authconfig.yaml) |
84+
| ContainerApp | 2025-01-01 | v1api20250101 | v2.15.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/app/v1api20250101/v1api20250101_containerapp.yaml) |
85+
| Job | 2025-01-01 | v1api20250101 | v2.15.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/app/v1api20250101/v1api20250101_job.yaml) |
86+
| ManagedEnvironment | 2025-01-01 | v1api20250101 | v2.15.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/app/v1api20250101/v1api20250101_managedenvironment.yaml) |
87+
7788
### Released
7889

7990
These resource(s) are 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/app/_index.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ no_list: true
55
---
66
To install the CRDs for these resources, your ASO configuration must include `app.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.
77

8+
### Next Release
9+
10+
Development of these new resources is complete and they will be available in the next release of ASO.
11+
12+
| Resource | ARM Version | CRD Version | Supported From | Sample |
13+
|--------------------|-------------|---------------|----------------|--------------------------------------------------------------------------------------------------------------------------------------|
14+
| AuthConfig | 2025-01-01 | v1api20250101 | v2.15.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/app/v1api20250101/v1api20250101_authconfig.yaml) |
15+
| ContainerApp | 2025-01-01 | v1api20250101 | v2.15.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/app/v1api20250101/v1api20250101_containerapp.yaml) |
16+
| Job | 2025-01-01 | v1api20250101 | v2.15.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/app/v1api20250101/v1api20250101_job.yaml) |
17+
| ManagedEnvironment | 2025-01-01 | v1api20250101 | v2.15.0 | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/app/v1api20250101/v1api20250101_managedenvironment.yaml) |
18+
819
### Released
920

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

‎v2/api/app/customizations/auth_config_extension_types_gen.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v2/api/app/customizations/container_app_extension_types_gen.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v2/api/app/customizations/job_extension_types_gen.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v2/api/app/customizations/managed_environment_extension_types_gen.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)