Upgrade CRDs to apiextensions.k8s.io/v1

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>

artifacts/flagger/crd.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: canaries.flagger.app
@@ -6,67 +6,74 @@ metadata:
     helm.sh/resource-policy: keep
 spec:
   group: flagger.app
-  version: v1beta1
+  names:
+    kind: Canary
+    listKind: CanaryList
+    plural: canaries
+    singular: canary
+    categories:
+      - all
+  scope: Namespaced
   versions:
     - name: v1beta1
       served: true
       storage: true
-    - name: v1alpha3
-      served: true
-      storage: false
-    - name: v1alpha2
-      served: false
-      storage: false
-    - name: v1alpha1
-      served: false
-      storage: false
-  names:
-    plural: canaries
-    singular: canary
-    kind: Canary
-    categories:
-      - all
-  scope: Namespaced
       subresources:
         status: {}
       additionalPrinterColumns:
         - name: Status
           type: string
-      JSONPath: .status.phase
+          jsonPath: .status.phase
         - name: Weight
           type: string
-      JSONPath: .status.canaryWeight
+          jsonPath: .status.canaryWeight
         - name: FailedChecks
           type: string
-      JSONPath: .status.failedChecks
+          jsonPath: .status.failedChecks
           priority: 1
         - name: Interval
           type: string
-      JSONPath: .spec.analysis.interval
+          jsonPath: .spec.analysis.interval
           priority: 1
         - name: Mirror
           type: boolean
-      JSONPath: .spec.analysis.mirror
+          jsonPath: .spec.analysis.mirror
           priority: 1
         - name: StepWeight
           type: string
-      JSONPath: .spec.analysis.stepWeight
+          jsonPath: .spec.analysis.stepWeight
           priority: 1
         - name: StepWeights
           type: string
-      JSONPath: .spec.analysis.stepWeights
+          jsonPath: .spec.analysis.stepWeights
           priority: 1
         - name: MaxWeight
           type: string
-      JSONPath: .spec.analysis.maxWeight
+          jsonPath: .spec.analysis.maxWeight
           priority: 1
         - name: LastTransitionTime
           type: string
-      JSONPath: .status.lastTransitionTime
+          jsonPath: .status.lastTransitionTime
-  validation:
+      schema:
         openAPIV3Schema:
+          description: Canary is the Schema for the Canary API.
+          type: object
           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: CanarySpec defines the desired state of a Canary.
+              type: object
               required:
                 - targetRef
                 - service
@@ -110,7 +117,7 @@ spec:
                     name:
                       type: string
                 ingressRef:
-              description: NGINX ingress selector
+                  description: Ingress selector
                   type: object
                   required: ["apiVersion", "kind", "name"]
                   properties:
@@ -138,9 +145,7 @@ spec:
                       type: string
                     targetPort:
                       description: Container target port name
-                  anyOf:
+                      x-kubernetes-int-or-string: true
-                    - type: string
-                    - type: number
                     portDiscovery:
                       description: Enable port dicovery
                       type: boolean
@@ -314,6 +319,7 @@ spec:
                       type: object
                       properties:
                         connectionPool:
+                          type: object
                           properties:
                             http:
                               description: HTTP connection pool settings.
@@ -698,6 +704,8 @@ spec:
                             additionalProperties:
                               type: string
             status:
+              description: CanaryStatus defines the observed state of a canary.
+              type: object
               properties:
                 phase:
                   description: Analysis phase of this canary
@@ -758,7 +766,7 @@ spec:
                         description: Type of this condition
                         type: string
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: metrictemplates.flagger.app
@@ -766,31 +774,44 @@ metadata:
     helm.sh/resource-policy: keep
 spec:
   group: flagger.app
-  version: v1beta1
+  names:
+    kind: MetricTemplate
+    listKind: MetricTemplateList
+    plural: metrictemplates
+    singular: metrictemplate
+    categories:
+      - all
+  scope: Namespaced
   versions:
     - name: v1beta1
       served: true
       storage: true
-    - name: v1alpha1
-      served: true
-      storage: false
-  names:
-    plural: metrictemplates
-    singular: metrictemplate
-    kind: MetricTemplate
-    categories:
-      - all
-  scope: Namespaced
       subresources:
         status: {}
       additionalPrinterColumns:
         - name: Provider
           type: string
-      JSONPath: .spec.provider.type
+          jsonPath: .spec.provider.type
-  validation:
+      schema:
         openAPIV3Schema:
+          description: MetricTemplate is the Schema for the MetricTemplates API.
+          type: object
           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: MetricTemplateSpec defines the desired state of a MetricTemplate.
+              type: object
               required:
                 - provider
                 - query
@@ -829,7 +850,7 @@ spec:
                   description: Query of this metric template
                   type: string
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: alertproviders.flagger.app
@@ -837,28 +858,44 @@ metadata:
     helm.sh/resource-policy: keep
 spec:
   group: flagger.app
-  version: v1beta1
+  names:
+    kind: AlertProvider
+    listKind: AlertProviderList
+    plural: alertproviders
+    singular: alertprovider
+    categories:
+      - all
+  scope: Namespaced
   versions:
     - name: v1beta1
       served: true
       storage: true
-  names:
-    plural: alertproviders
-    singular: alertprovider
-    kind: AlertProvider
-    categories:
-      - all
-  scope: Namespaced
       subresources:
         status: {}
       additionalPrinterColumns:
         - name: Type
           type: string
-      JSONPath: .spec.type
+          jsonPath: .spec.type
-  validation:
+      schema:
         openAPIV3Schema:
+          description: AlertProvider is the Schema for the AlertProvider API.
+          type: object
           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: AlertProviderSpec defines the desired state of a AlertProvider.
+              type: object
               oneOf:
                 - required:
                     - type

charts/flagger/crds/crd.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: canaries.flagger.app
@@ -6,67 +6,74 @@ metadata:
     helm.sh/resource-policy: keep
 spec:
   group: flagger.app
-  version: v1beta1
+  names:
+    kind: Canary
+    listKind: CanaryList
+    plural: canaries
+    singular: canary
+    categories:
+      - all
+  scope: Namespaced
   versions:
     - name: v1beta1
       served: true
       storage: true
-    - name: v1alpha3
-      served: true
-      storage: false
-    - name: v1alpha2
-      served: false
-      storage: false
-    - name: v1alpha1
-      served: false
-      storage: false
-  names:
-    plural: canaries
-    singular: canary
-    kind: Canary
-    categories:
-      - all
-  scope: Namespaced
       subresources:
         status: {}
       additionalPrinterColumns:
         - name: Status
           type: string
-      JSONPath: .status.phase
+          jsonPath: .status.phase
         - name: Weight
           type: string
-      JSONPath: .status.canaryWeight
+          jsonPath: .status.canaryWeight
         - name: FailedChecks
           type: string
-      JSONPath: .status.failedChecks
+          jsonPath: .status.failedChecks
           priority: 1
         - name: Interval
           type: string
-      JSONPath: .spec.analysis.interval
+          jsonPath: .spec.analysis.interval
           priority: 1
         - name: Mirror
           type: boolean
-      JSONPath: .spec.analysis.mirror
+          jsonPath: .spec.analysis.mirror
           priority: 1
         - name: StepWeight
           type: string
-      JSONPath: .spec.analysis.stepWeight
+          jsonPath: .spec.analysis.stepWeight
           priority: 1
         - name: StepWeights
           type: string
-      JSONPath: .spec.analysis.stepWeights
+          jsonPath: .spec.analysis.stepWeights
           priority: 1
         - name: MaxWeight
           type: string
-      JSONPath: .spec.analysis.maxWeight
+          jsonPath: .spec.analysis.maxWeight
           priority: 1
         - name: LastTransitionTime
           type: string
-      JSONPath: .status.lastTransitionTime
+          jsonPath: .status.lastTransitionTime
-  validation:
+      schema:
         openAPIV3Schema:
+          description: Canary is the Schema for the Canary API.
+          type: object
           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: CanarySpec defines the desired state of a Canary.
+              type: object
               required:
                 - targetRef
                 - service
@@ -110,7 +117,7 @@ spec:
                     name:
                       type: string
                 ingressRef:
-              description: NGINX ingress selector
+                  description: Ingress selector
                   type: object
                   required: ["apiVersion", "kind", "name"]
                   properties:
@@ -138,9 +145,7 @@ spec:
                       type: string
                     targetPort:
                       description: Container target port name
-                  anyOf:
+                      x-kubernetes-int-or-string: true
-                    - type: string
-                    - type: number
                     portDiscovery:
                       description: Enable port dicovery
                       type: boolean
@@ -314,6 +319,7 @@ spec:
                       type: object
                       properties:
                         connectionPool:
+                          type: object
                           properties:
                             http:
                               description: HTTP connection pool settings.
@@ -698,6 +704,8 @@ spec:
                             additionalProperties:
                               type: string
             status:
+              description: CanaryStatus defines the observed state of a canary.
+              type: object
               properties:
                 phase:
                   description: Analysis phase of this canary
@@ -758,7 +766,7 @@ spec:
                         description: Type of this condition
                         type: string
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: metrictemplates.flagger.app
@@ -766,31 +774,44 @@ metadata:
     helm.sh/resource-policy: keep
 spec:
   group: flagger.app
-  version: v1beta1
+  names:
+    kind: MetricTemplate
+    listKind: MetricTemplateList
+    plural: metrictemplates
+    singular: metrictemplate
+    categories:
+      - all
+  scope: Namespaced
   versions:
     - name: v1beta1
       served: true
       storage: true
-    - name: v1alpha1
-      served: true
-      storage: false
-  names:
-    plural: metrictemplates
-    singular: metrictemplate
-    kind: MetricTemplate
-    categories:
-      - all
-  scope: Namespaced
       subresources:
         status: {}
       additionalPrinterColumns:
         - name: Provider
           type: string
-      JSONPath: .spec.provider.type
+          jsonPath: .spec.provider.type
-  validation:
+      schema:
         openAPIV3Schema:
+          description: MetricTemplate is the Schema for the MetricTemplates API.
+          type: object
           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: MetricTemplateSpec defines the desired state of a MetricTemplate.
+              type: object
               required:
                 - provider
                 - query
@@ -829,7 +850,7 @@ spec:
                   description: Query of this metric template
                   type: string
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: alertproviders.flagger.app
@@ -837,28 +858,44 @@ metadata:
     helm.sh/resource-policy: keep
 spec:
   group: flagger.app
-  version: v1beta1
+  names:
+    kind: AlertProvider
+    listKind: AlertProviderList
+    plural: alertproviders
+    singular: alertprovider
+    categories:
+      - all
+  scope: Namespaced
   versions:
     - name: v1beta1
       served: true
       storage: true
-  names:
-    plural: alertproviders
-    singular: alertprovider
-    kind: AlertProvider
-    categories:
-      - all
-  scope: Namespaced
       subresources:
         status: {}
       additionalPrinterColumns:
         - name: Type
           type: string
-      JSONPath: .spec.type
+          jsonPath: .spec.type
-  validation:
+      schema:
         openAPIV3Schema:
+          description: AlertProvider is the Schema for the AlertProvider API.
+          type: object
           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: AlertProviderSpec defines the desired state of a AlertProvider.
+              type: object
               oneOf:
                 - required:
                     - type

kustomize/base/flagger/crd.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: canaries.flagger.app
@@ -6,67 +6,74 @@ metadata:
     helm.sh/resource-policy: keep
 spec:
   group: flagger.app
-  version: v1beta1
+  names:
+    kind: Canary
+    listKind: CanaryList
+    plural: canaries
+    singular: canary
+    categories:
+      - all
+  scope: Namespaced
   versions:
     - name: v1beta1
       served: true
       storage: true
-    - name: v1alpha3
-      served: true
-      storage: false
-    - name: v1alpha2
-      served: false
-      storage: false
-    - name: v1alpha1
-      served: false
-      storage: false
-  names:
-    plural: canaries
-    singular: canary
-    kind: Canary
-    categories:
-      - all
-  scope: Namespaced
       subresources:
         status: {}
       additionalPrinterColumns:
         - name: Status
           type: string
-      JSONPath: .status.phase
+          jsonPath: .status.phase
         - name: Weight
           type: string
-      JSONPath: .status.canaryWeight
+          jsonPath: .status.canaryWeight
         - name: FailedChecks
           type: string
-      JSONPath: .status.failedChecks
+          jsonPath: .status.failedChecks
           priority: 1
         - name: Interval
           type: string
-      JSONPath: .spec.analysis.interval
+          jsonPath: .spec.analysis.interval
           priority: 1
         - name: Mirror
           type: boolean
-      JSONPath: .spec.analysis.mirror
+          jsonPath: .spec.analysis.mirror
           priority: 1
         - name: StepWeight
           type: string
-      JSONPath: .spec.analysis.stepWeight
+          jsonPath: .spec.analysis.stepWeight
           priority: 1
         - name: StepWeights
           type: string
-      JSONPath: .spec.analysis.stepWeights
+          jsonPath: .spec.analysis.stepWeights
           priority: 1
         - name: MaxWeight
           type: string
-      JSONPath: .spec.analysis.maxWeight
+          jsonPath: .spec.analysis.maxWeight
           priority: 1
         - name: LastTransitionTime
           type: string
-      JSONPath: .status.lastTransitionTime
+          jsonPath: .status.lastTransitionTime
-  validation:
+      schema:
         openAPIV3Schema:
+          description: Canary is the Schema for the Canary API.
+          type: object
           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: CanarySpec defines the desired state of a Canary.
+              type: object
               required:
                 - targetRef
                 - service
@@ -110,7 +117,7 @@ spec:
                     name:
                       type: string
                 ingressRef:
-              description: NGINX ingress selector
+                  description: Ingress selector
                   type: object
                   required: ["apiVersion", "kind", "name"]
                   properties:
@@ -138,9 +145,7 @@ spec:
                       type: string
                     targetPort:
                       description: Container target port name
-                  anyOf:
+                      x-kubernetes-int-or-string: true
-                    - type: string
-                    - type: number
                     portDiscovery:
                       description: Enable port dicovery
                       type: boolean
@@ -314,6 +319,7 @@ spec:
                       type: object
                       properties:
                         connectionPool:
+                          type: object
                           properties:
                             http:
                               description: HTTP connection pool settings.
@@ -698,6 +704,8 @@ spec:
                             additionalProperties:
                               type: string
             status:
+              description: CanaryStatus defines the observed state of a canary.
+              type: object
               properties:
                 phase:
                   description: Analysis phase of this canary
@@ -758,7 +766,7 @@ spec:
                         description: Type of this condition
                         type: string
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: metrictemplates.flagger.app
@@ -766,31 +774,44 @@ metadata:
     helm.sh/resource-policy: keep
 spec:
   group: flagger.app
-  version: v1beta1
+  names:
+    kind: MetricTemplate
+    listKind: MetricTemplateList
+    plural: metrictemplates
+    singular: metrictemplate
+    categories:
+      - all
+  scope: Namespaced
   versions:
     - name: v1beta1
       served: true
       storage: true
-    - name: v1alpha1
-      served: true
-      storage: false
-  names:
-    plural: metrictemplates
-    singular: metrictemplate
-    kind: MetricTemplate
-    categories:
-      - all
-  scope: Namespaced
       subresources:
         status: {}
       additionalPrinterColumns:
         - name: Provider
           type: string
-      JSONPath: .spec.provider.type
+          jsonPath: .spec.provider.type
-  validation:
+      schema:
         openAPIV3Schema:
+          description: MetricTemplate is the Schema for the MetricTemplates API.
+          type: object
           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: MetricTemplateSpec defines the desired state of a MetricTemplate.
+              type: object
               required:
                 - provider
                 - query
@@ -829,7 +850,7 @@ spec:
                   description: Query of this metric template
                   type: string
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: alertproviders.flagger.app
@@ -837,28 +858,44 @@ metadata:
     helm.sh/resource-policy: keep
 spec:
   group: flagger.app
-  version: v1beta1
+  names:
+    kind: AlertProvider
+    listKind: AlertProviderList
+    plural: alertproviders
+    singular: alertprovider
+    categories:
+      - all
+  scope: Namespaced
   versions:
     - name: v1beta1
       served: true
       storage: true
-  names:
-    plural: alertproviders
-    singular: alertprovider
-    kind: AlertProvider
-    categories:
-      - all
-  scope: Namespaced
       subresources:
         status: {}
       additionalPrinterColumns:
         - name: Type
           type: string
-      JSONPath: .spec.type
+          jsonPath: .spec.type
-  validation:
+      schema:
         openAPIV3Schema:
+          description: AlertProvider is the Schema for the AlertProvider API.
+          type: object
           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: AlertProviderSpec defines the desired state of a AlertProvider.
+              type: object
               oneOf:
                 - required:
                     - type