Merge branch 'main' into fix/managedcluster-props

Azure · Jun 16, 2023 · 37f3cac · 37f3cac
2 parents 6e24176 + c6211a9
commit 37f3cac
Show file tree

Hide file tree

Showing 36 changed files with 2,472 additions and 288 deletions.
diff --git a/Makefile b/Makefile
@@ -206,7 +206,7 @@ validate-cainjection-files:
 
 # Generate manifests for helm and package them up
 .PHONY: helm-chart-manifests
-helm-chart-manifests: LATEST_TAG := $(shell curl -sL https://api.github.com/repos/Azure/azure-service-operator/releases/latest  | jq '.tag_name' --raw-output )
+helm-chart-manifests: LATEST_TAG := $(shell curl -sL https://api.github.com/repos/Azure/azure-service-operator/releases | jq '[.[] | select(.tag_name | startswith("1.0")).tag_name][0]' --raw-output )
 helm-chart-manifests: KUBE_RBAC_PROXY := gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
 helm-chart-manifests: generate
 	@echo "Latest released tag is $(LATEST_TAG)"

diff --git a/charts/azure-service-operator-1.12.0.tgz b/charts/azure-service-operator-1.12.0.tgz
diff --git a/charts/azure-service-operator/Chart.yaml b/charts/azure-service-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: azure-service-operator
-version: 1.11.0
-appVersion: 1.0.45297
+version: 1.12.0
+appVersion: 1.0.59040
 description: Deploy components and dependencies of azure-service-operator
 home: https://github.com/Azure/azure-service-operator
 sources:

diff --git a/...apiextensions.k8s.io_v1_customresourcedefinition_azuresqlactions.azure.microsoft.com.yaml b/...apiextensions.k8s.io_v1_customresourcedefinition_azuresqlactions.azure.microsoft.com.yaml
@@ -62,6 +62,8 @@ spec:
                 type: string
               serverSecretKeyVault:
                 type: string
+              subscriptionId:
+                type: string
               userSecretKeyVault:
                 type: string
             required:

diff --git a/...iextensions.k8s.io_v1_customresourcedefinition_azuresqldatabases.azure.microsoft.com.yaml b/...iextensions.k8s.io_v1_customresourcedefinition_azuresqldatabases.azure.microsoft.com.yaml
@@ -205,6 +205,8 @@ spec:
                 required:
                 - name
                 type: object
+              subscriptionId:
+                type: string
               weekOfYear:
                 format: int32
                 type: integer
@@ -213,6 +215,7 @@ spec:
               yearlyRetention:
                 type: string
             required:
+            - edition
             - location
             - resourceGroup
             - server

diff --git a/...nsions.k8s.io_v1_customresourcedefinition_azuresqlfailovergroups.azure.microsoft.com.yaml b/...nsions.k8s.io_v1_customresourcedefinition_azuresqlfailovergroups.azure.microsoft.com.yaml
@@ -162,6 +162,8 @@ spec:
           spec:
             description: AzureSqlFailoverGroupSpec defines the desired state of AzureSqlFailoverGroup
             properties:
+              SecondaryServerSubscriptionId:
+                type: string
               databaseList:
                 items:
                   type: string
@@ -196,6 +198,8 @@ spec:
               server:
                 minLength: 1
                 type: string
+              subscriptionId:
+                type: string
             required:
             - databaseList
             - failoverGracePeriod

diff --git a/...ensions.k8s.io_v1_customresourcedefinition_azuresqlfirewallrules.azure.microsoft.com.yaml b/...ensions.k8s.io_v1_customresourcedefinition_azuresqlfirewallrules.azure.microsoft.com.yaml
@@ -155,6 +155,8 @@ spec:
                 type: string
               startIpAddress:
                 type: string
+              subscriptionID:
+                type: string
             required:
             - resourceGroup
             - server

diff --git a/...tensions.k8s.io_v1_customresourcedefinition_azuresqlmanagedusers.azure.microsoft.com.yaml b/...tensions.k8s.io_v1_customresourcedefinition_azuresqlmanagedusers.azure.microsoft.com.yaml
@@ -67,6 +67,8 @@ spec:
               server:
                 minLength: 1
                 type: string
+              subscriptionId:
+                type: string
             required:
             - dbName
             - managedIdentityClientId

diff --git a/...apiextensions.k8s.io_v1_customresourcedefinition_azuresqlservers.azure.microsoft.com.yaml b/...apiextensions.k8s.io_v1_customresourcedefinition_azuresqlservers.azure.microsoft.com.yaml
@@ -149,6 +149,8 @@ spec:
                 minLength: 1
                 pattern: ^[-\w\._\(\)]+$
                 type: string
+              subscriptionId:
+                type: string
             required:
             - location
             - resourceGroup

diff --git a/...s/apiextensions.k8s.io_v1_customresourcedefinition_azuresqlusers.azure.microsoft.com.yaml b/...s/apiextensions.k8s.io_v1_customresourcedefinition_azuresqlusers.azure.microsoft.com.yaml
@@ -45,7 +45,6 @@ spec:
             description: AzureSQLUserSpec defines the desired state of SqlUser
             properties:
               adminSecret:
-                description: optional
                 type: string
               adminSecretKeyVault:
                 type: string
@@ -71,6 +70,9 @@ spec:
               server:
                 minLength: 1
                 type: string
+              subscriptionId:
+                description: optional
+                type: string
               username:
                 type: string
             required:

diff --git a/...iextensions.k8s.io_v1_customresourcedefinition_azuresqlvnetrules.azure.microsoft.com.yaml b/...iextensions.k8s.io_v1_customresourcedefinition_azuresqlvnetrules.azure.microsoft.com.yaml
@@ -57,6 +57,8 @@ spec:
               server:
                 minLength: 1
                 type: string
+              serverSubscriptionID:
+                type: string
               subnetName:
                 type: string
               vNetName:

diff --git a/charts/azure-service-operator/values.yaml b/charts/azure-service-operator/values.yaml
@@ -48,7 +48,7 @@ recoverSoftDeletedKeyVaultSecrets: True
 # corresponding CRD yaml in the cart (and so no CRD in the k8s
 # repository).
 image:
-  repository: mcr.microsoft.com/k8s/azureserviceoperator:1.0.45297
+  repository: mcr.microsoft.com/k8s/azureserviceoperator:1.0.59040
   kubeRBACProxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
 
 # installAadPodIdentity determines if the aad-pod-identity subchart should be installed.

diff --git a/charts/index.yaml b/charts/index.yaml
@@ -1,9 +1,26 @@
 apiVersion: v1
 entries:
   azure-service-operator:
+  - apiVersion: v2
+    appVersion: 1.0.59040
+    created: "2023-06-14T20:49:59.882254535Z"
+    dependencies:
+    - condition: installAadPodIdentity
+      name: aad-pod-identity
+      repository: https://raw.githubusercontent.com/Azure/aad-pod-identity/master/charts
+      version: 4.1.9
+    description: Deploy components and dependencies of azure-service-operator
+    digest: 6c019f7349b413b9d59e41fa2befcf20171bd3a5fba09e5b6247e6458c4dc4ee
+    home: https://github.com/Azure/azure-service-operator
+    name: azure-service-operator
+    sources:
+    - https://github.com/Azure/azure-service-operator
+    urls:
+    - azure-service-operator-1.12.0.tgz
+    version: 1.12.0
   - apiVersion: v2
     appVersion: 1.0.45297
-    created: "2022-07-29T22:11:53.712151172Z"
+    created: "2023-06-14T20:49:59.879235895Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -20,7 +37,7 @@ entries:
     version: 1.11.0
   - apiVersion: v2
     appVersion: 1.0.39435
-    created: "2022-07-29T22:11:53.708389881Z"
+    created: "2023-06-14T20:49:59.877141044Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -37,7 +54,7 @@ entries:
     version: 1.10.0
   - apiVersion: v2
     appVersion: 1.0.28631
-    created: "2022-07-29T22:11:53.746124088Z"
+    created: "2023-06-14T20:49:59.899129212Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -54,7 +71,7 @@ entries:
     version: 1.9.0
   - apiVersion: v2
     appVersion: 1.0.28631
-    created: "2022-07-29T22:11:53.733547119Z"
+    created: "2023-06-14T20:49:59.89723051Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -71,7 +88,7 @@ entries:
     version: 1.8.0
   - apiVersion: v2
     appVersion: 1.0.27207
-    created: "2022-07-29T22:11:53.731312024Z"
+    created: "2023-06-14T20:49:59.895052889Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -88,7 +105,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: 1.0.24492
-    created: "2022-07-29T22:11:53.728443231Z"
+    created: "2023-06-14T20:49:59.891652991Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -105,7 +122,7 @@ entries:
     version: 1.6.0
   - apiVersion: v2
     appVersion: 1.0.24492
-    created: "2022-07-29T22:11:53.726515636Z"
+    created: "2023-06-14T20:49:59.889778885Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -122,7 +139,7 @@ entries:
     version: 1.5.0
   - apiVersion: v2
     appVersion: 1.0.23956
-    created: "2022-07-29T22:11:53.72480264Z"
+    created: "2023-06-14T20:49:59.888101095Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -139,7 +156,7 @@ entries:
     version: 1.4.0
   - apiVersion: v2
     appVersion: 1.0.23694
-    created: "2022-07-29T22:11:53.716022262Z"
+    created: "2023-06-14T20:49:59.885660994Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -156,7 +173,7 @@ entries:
     version: 1.3.0
   - apiVersion: v2
     appVersion: 1.0.22275
-    created: "2022-07-29T22:11:53.714181867Z"
+    created: "2023-06-14T20:49:59.883989582Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -173,7 +190,7 @@ entries:
     version: 1.2.0
   - apiVersion: v2
     appVersion: 0.1.0
-    created: "2022-07-29T22:11:53.705921787Z"
+    created: "2023-06-14T20:49:59.874792911Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -190,7 +207,7 @@ entries:
     version: 1.1.0
   - apiVersion: v2
     appVersion: 0.1.0
-    created: "2022-07-29T22:11:53.703722993Z"
+    created: "2023-06-14T20:49:59.871222855Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -207,7 +224,7 @@ entries:
     version: 1.0.0
   - apiVersion: v2
     appVersion: 0.1.0
-    created: "2022-07-29T22:11:53.699061804Z"
+    created: "2023-06-14T20:49:59.869257541Z"
     dependencies:
     - condition: installAadPodIdentity
       name: aad-pod-identity
@@ -222,4 +239,4 @@ entries:
     urls:
     - azure-service-operator-0.1.0.tgz
     version: 0.1.0
-generated: "2022-07-29T22:11:53.697048209Z"
+generated: "2023-06-14T20:49:59.867354816Z"