CRD: Move to apiextensions.k8s.io/v1

2026-03-26 21:33:14 +00:00 · 2021-02-10 21:12:24 +01:00
parent e5e996569c
commit fbae5cf590
4 changed files with 125 additions and 119 deletions
--- a/ansible/templates/crd.yml.j2
+++ b/ansible/templates/crd.yml.j2
@@ -1,5 +1,5 @@
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  name: awxs.awx.ansible.com
@@ -11,18 +11,17 @@ spec:
    plural: awxs
    singular: awx
  scope: Namespaced
-  subresources:
-    status: {}
-  version: v1beta1
  versions:
    - name: v1beta1
      served: true
      storage: true
-  validation:
-    openAPIV3Schema:
-      description: Schema validation for the AWX CRD
-      type: object
-      properties:
-        spec:
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
+          description: Schema validation for the AWX CRD
          type: object
          properties:
+            spec:
+              type: object
+              properties:
--- a/deploy/awx-operator.yaml
+++ b/deploy/awx-operator.yaml
@@ -11,6 +11,7 @@ rules:
      - route.openshift.io
    resources:
      - routes
+      - routes/custom-host
    verbs:
      - '*'
  - apiGroups:
@@ -139,7 +140,7 @@ spec:
          emptyDir: {}

 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  name: awxs.awx.ansible.com
@@ -151,18 +152,17 @@ spec:
    plural: awxs
    singular: awx
  scope: Namespaced
-  subresources:
-    status: {}
-  version: v1beta1
  versions:
    - name: v1beta1
      served: true
      storage: true
-  validation:
-    openAPIV3Schema:
-      description: Schema validation for the AWX CRD
-      type: object
-      properties:
-        spec:
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
+          description: Schema validation for the AWX CRD
          type: object
          properties:
+            spec:
+              type: object
+              properties:
--- a/deploy/crds/awx_v1beta1_crd.yaml
+++ b/deploy/crds/awx_v1beta1_crd.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  name: awxs.awx.ansible.com
@@ -11,18 +11,17 @@ spec:
    plural: awxs
    singular: awx
  scope: Namespaced
-  subresources:
-    status: {}
-  version: v1beta1
  versions:
    - name: v1beta1
      served: true
      storage: true
-  validation:
-    openAPIV3Schema:
-      description: Schema validation for the AWX CRD
-      type: object
-      properties:
-        spec:
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
+          description: Schema validation for the AWX CRD
          type: object
          properties:
+            spec:
+              type: object
+              properties:
--- a/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml
+++ b/deploy/olm-catalog/awx-operator/manifests/awx.ansible.com_awxs_crd.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  creationTimestamp: null
@@ -12,95 +12,103 @@ spec:
    plural: awxs
    singular: awx
  scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: Schema validation for the AWX CRD
-      properties:
-        spec:
-          properties:
-            tower_hostname:
-              description: The hostname of the instance
-              type: string
-            tower_admin_email:
-              description: The admin user email
-              type: string
-            tower_admin_password_secret:
-              description: Secret where the admin password can be found
-              type: string
-            tower_postgres_configuration_secret:
-              description: Secret where the database configuration can be found
-              type: string
-            tower_secret_key_secret:
-              description: Secret where the secret key can be found
-              type: string
-            tower_ingress_type:
-              description: The ingress type to use to reach the deployed instance
-              type: string
-              enum:
-                - none
-                - Ingress
-                - Route
-            tower_route_host:
-              description: The DNS to use to points to the instance
-              type: string
-            tower_route_tls_termination_mechanism:
-              description: The secure TLS termination mechanism to use
-              type: string
-              enum:
-                - Edge
-                - Passthrough
-            tower_route_tls_secret:
-              description: Secret where the TLS related credentials are stored
-              type: string
-            tower_image_pull_policy:
-              description: The image pull policy
-              type: string
-              enum:
-                - Always
-                - Never
-                - IfNotPresent
-            tower_task_resource_requirements:
-              description: Resource requirements for the task container
-              type: object
-            tower_web_resource_requirements:
-              description: Resource requirements for the web container
-              type: object
-            tower_replicas:
-              description: Number of instance replicas
-              type: integer
-              format: int32
-            tower_garbage_collect_secrets:
-              description: Whether or not to remove secrets upon instance removal
-              type: boolean
-            tower_create_preload_data:
-              description: Whether or not to preload data upon Tower instance creation
-              type: boolean
-          type: object
-        status:
-          properties:
-            towerURL:
-              description: URL to access the deployed instance
-              type: string
-            towerAdminUser:
-              description: Admin user of the deployed instance
-              type: string
-            towerAdminPasswordSecret:
-              description: Admin password of the deployed instance
-              type: string
-            towerVersion:
-              description: Version of the deployed instance
-              type: string
-      type: object
-  version: v1beta1
  versions:
    - name: v1beta1
      served: true
      storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
+          description: Schema validation for the AWX CRD
+          properties:
+            spec:
+              properties:
+                tower_hostname:
+                  description: The hostname of the instance
+                  type: string
+                tower_admin_email:
+                  description: The admin user email
+                  type: string
+                tower_admin_password_secret:
+                  description: Secret where the admin password can be found
+                  type: string
+                tower_postgres_configuration_secret:
+                  description: Secret where the database configuration can be found
+                  type: string
+                tower_secret_key_secret:
+                  description: Secret where the secret key can be found
+                  type: string
+                tower_ingress_type:
+                  description: The ingress type to use to reach the deployed instance
+                  type: string
+                  enum:
+                    - none
+                    - Ingress
+                    - Route
+                tower_route_host:
+                  description: The DNS to use to points to the instance
+                  type: string
+                tower_route_tls_termination_mechanism:
+                  description: The secure TLS termination mechanism to use
+                  type: string
+                  enum:
+                    - Edge
+                    - Passthrough
+                tower_route_tls_secret:
+                  description: Secret where the TLS related credentials are stored
+                  type: string
+                tower_image_pull_policy:
+                  description: The image pull policy
+                  type: string
+                  enum:
+                    - Always
+                    - Never
+                    - IfNotPresent
+                tower_task_resource_requirements:
+                  description: Resource requirements for the task container
+                  type: object
+                tower_web_resource_requirements:
+                  description: Resource requirements for the web container
+                  type: object
+                tower_replicas:
+                  description: Number of instance replicas
+                  type: integer
+                  format: int32
+                tower_garbage_collect_secrets:
+                  description: Whether or not to remove secrets upon instance removal
+                  type: boolean
+                tower_create_preload_data:
+                  description: Whether or not to preload data upon Tower instance creation
+                  type: boolean
+              type: object
+            status:
+              properties:
+                towerURL:
+                  description: URL to access the deployed instance
+                  type: string
+                towerAdminUser:
+                  description: Admin user of the deployed instance
+                  type: string
+                towerAdminPasswordSecret:
+                  description: Admin password of the deployed instance
+                  type: string
+                towerVersion:
+                  description: Version of the deployed instance
+                  type: string
+                conditions:
+                  description: The resulting conditions when a Service Telemetry is instantiated
+                  items:
+                    properties:
+                      status:
+                        type: string
+                      type:
+                        type: string
+                      reason:
+                        type: string
+                      lastTransitionTime:
+                        type: string
+                    type: object
+                  type: array
+              type: object
+          type: object