initial k8s 1.22 deprecation changes (#27)

* initial k8s 1.22 deprecation changes - dioscuri * initial k8s 1.22 deprecation changes - dbaas-operator * use updated branch imageTags * add leases.coordination.k8s.io verbs to roles * up to date * version bumps * chart updates for 0.6.2 * dioscuri remove ingress and route migrate * chore: bump dbaas app version * chore: bump other chart versions * chore: remove tags Co-authored-by: Ben Jackson <[email protected]>
amazeeio · May 3, 2022 · 61ead7e · 61ead7e
1 parent 8f9f866
commit 61ead7e
Show file tree

Hide file tree

Showing 11 changed files with 440 additions and 435 deletions.
diff --git a/charts/aergia/Chart.yaml b/charts/aergia/Chart.yaml
@@ -8,9 +8,10 @@ maintainers:
 - name: shreddedbacon
   email: [email protected]
   url: https://amazee.io
+kubeVersion: ">= 1.19.0-0"
 
 type: application
 
-version: 0.2.1
+version: 0.2.2
 
 appVersion: v0.1.2
diff --git a/charts/dbaas-operator/Chart.yaml b/charts/dbaas-operator/Chart.yaml
@@ -12,9 +12,10 @@ maintainers:
 - name: smlx
   email: [email protected]
   url: https://amazee.io
+kubeVersion: ">= 1.19.0-0"
 
 type: application
 
-version: 0.2.2
+version: 0.3.0
 
-appVersion: v0.2.2
+appVersion: v0.3.0
diff --git a/charts/dbaas-operator/crds/mariadb.yaml b/charts/dbaas-operator/crds/mariadb.yaml
@@ -1,9 +1,9 @@
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   creationTimestamp: null
   name: mariadbproviders.mariadb.amazee.io
 spec:
@@ -14,62 +14,61 @@ spec:
     plural: mariadbproviders
     singular: mariadbprovider
   scope: Namespaced
-  validation:
-    openAPIV3Schema:
-      description: MariaDBProvider is the Schema for the mariadbproviders API
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: MariaDBProviderSpec defines the desired state of MariaDBProvider
-          properties:
-            environment:
-              description: These are the spec options for providers
-              type: string
-            hostname:
-              type: string
-            name:
-              type: string
-            namespace:
-              type: string
-            password:
-              type: string
-            port:
-              type: string
-            readReplicaHostnames:
-              items:
-                type: string
-              type: array
-            type:
-              type: string
-            user:
-              type: string
-          type: object
-        status:
-          description: MariaDBProviderStatus defines the observed state of MariaDBProvider
-          type: object
-      type: object
-  version: v1
   versions:
   - name: v1
+    schema:
+      openAPIV3Schema:
+        description: MariaDBProvider is the Schema for the mariadbproviders API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: MariaDBProviderSpec defines the desired state of MariaDBProvider
+            properties:
+              environment:
+                description: These are the spec options for providers
+                type: string
+              hostname:
+                type: string
+              name:
+                type: string
+              namespace:
+                type: string
+              password:
+                type: string
+              port:
+                type: string
+              readReplicaHostnames:
+                items:
+                  type: string
+                type: array
+              type:
+                type: string
+              user:
+                type: string
+            type: object
+          status:
+            description: MariaDBProviderStatus defines the observed state of MariaDBProvider
+            type: object
+        type: object
     served: true
     storage: true
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
+    controller-gen.kubebuilder.io/version: v0.6.2
   creationTimestamp: null
   name: mariadbconsumers.mariadb.amazee.io
 spec:
@@ -80,76 +79,75 @@ spec:
     plural: mariadbconsumers
     singular: mariadbconsumer
   scope: Namespaced
-  validation:
-    openAPIV3Schema:
-      description: MariaDBConsumer is the Schema for the mariadbconsumers API
-      properties:
-        apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation
-            of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-          type: string
-        kind:
-          description: 'Kind is a string value representing the REST resource this
-            object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          description: MariaDBConsumerSpec defines the desired state of MariaDBConsumer
-          properties:
-            consumer:
-              description: MariaDBConsumerData defines the provider link for this
-                consumer
-              properties:
-                database:
-                  type: string
-                password:
-                  type: string
-                services:
-                  description: MariaDBConsumerServices defines the provider link for
-                    this consumer
-                  properties:
-                    primary:
-                      type: string
-                    replicas:
-                      items:
-                        type: string
-                      type: array
-                  type: object
-                username:
-                  type: string
-              type: object
-            environment:
-              description: These are the spec options for consumers
-              type: string
-            provider:
-              description: MariaDBConsumerProvider defines the provider link for this
-                consumer
-              properties:
-                hostname:
-                  type: string
-                name:
-                  type: string
-                namespace:
-                  type: string
-                port:
-                  type: string
-                readReplicas:
-                  items:
-                    type: string
-                  type: array
-                type:
-                  type: string
-              type: object
-          type: object
-        status:
-          description: MariaDBConsumerStatus defines the observed state of MariaDBConsumer
-          type: object
-      type: object
-  version: v1
   versions:
   - name: v1
+    schema:
+      openAPIV3Schema:
+        description: MariaDBConsumer is the Schema for the mariadbconsumers API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: MariaDBConsumerSpec defines the desired state of MariaDBConsumer
+            properties:
+              consumer:
+                description: MariaDBConsumerData defines the provider link for this
+                  consumer
+                properties:
+                  database:
+                    type: string
+                  password:
+                    type: string
+                  services:
+                    description: MariaDBConsumerServices defines the provider link
+                      for this consumer
+                    properties:
+                      primary:
+                        type: string
+                      replicas:
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                  username:
+                    type: string
+                type: object
+              environment:
+                description: These are the spec options for consumers
+                type: string
+              provider:
+                description: MariaDBConsumerProvider defines the provider link for
+                  this consumer
+                properties:
+                  hostname:
+                    type: string
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                  port:
+                    type: string
+                  readReplicas:
+                    items:
+                      type: string
+                    type: array
+                  type:
+                    type: string
+                type: object
+            type: object
+          status:
+            description: MariaDBConsumerStatus defines the observed state of MariaDBConsumer
+            type: object
+        type: object
     served: true
     storage: true