crds to apiextensions.k8s.io/v1

sapcc · Apr 27, 2022 · 849fb17 · 849fb17
1 parent 34537ee
commit 849fb17
Show file tree

Hide file tree

Showing 3 changed files with 142 additions and 139 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,6 @@
 # Image URL to use all building/pushing image targets
 IMG ?= keppel.eu-de-1.cloud.sap/ccloud/digicert-issuer
-# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1beta1"
+CRD_OPTIONS ?= "crd:crdVersions=v1"
 
 # Temporary directory for tools
 TOOLS_BIN_DIR = $(shell pwd)/tmp/bin

diff --git a/apis/certmanager/v1beta1/zz_generated.deepcopy.go b/apis/certmanager/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/certmanager.cloud.sap_digicertissuers.yaml b/config/crd/bases/certmanager.cloud.sap_digicertissuers.yaml
@@ -1,165 +1,164 @@
 
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: digicertissuers.certmanager.cloud.sap
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .status.conditions[?(@.type=="Ready")].status
-    name: Ready
-    type: boolean
-  - JSONPath: .metadata.creationTimestamp
-    name: Age
-    type: date
   group: certmanager.cloud.sap
   names:
     kind: DigicertIssuer
     listKind: DigicertIssuerList
     plural: digicertissuers
     singular: digicertissuer
   scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      description: DigicertIssuer is the Schema for the digicertissuers 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: DigicertIssuerSpec defines the desired state of DigicertIssuer
-          properties:
-            provisioner:
-              description: Provisioner contains the DigiCert provisioner configuration.
-              properties:
-                apiTokenReference:
-                  description: APITokenReference references a secret in the same namespace
-                    containing the DigiCert API token.
-                  properties:
-                    key:
-                      description: The key in the secret.
-                      type: string
-                    name:
-                      description: The name of the secret.
-                      type: string
-                  required:
-                  - key
-                  - name
-                  type: object
-                caCertID:
-                  description: CACertID is the ID of the CA if multiple CA certificates
-                    are configured in the (sub-)account.
-                  type: string
-                containerID:
-                  description: ContainerID is the ID of the division
-                  type: integer
-                disableRenewalNotifications:
-                  description: DisableRenewalNotifications disables email renewal
-                    notifications for expiring certificates.
-                  type: boolean
-                orderType:
-                  description: OrderType is the certificate order type.
-                  type: string
-                organizationID:
-                  description: OrganizationID is the ID of the organization in Digicert.
-                  type: integer
-                organizationName:
-                  description: OrganizationName is the name of the organization in
-                    Digicert. If specified takes precedence over OrganizationID.
-                  type: string
-                organizationUnits:
-                  description: OrganizationUnits is the list of organizational units.
-                  items:
-                    type: string
-                  type: array
-                paymentMethod:
-                  description: PaymentMethod is the configured payment method in the
-                    Digicert account.
-                  type: string
-                skipApproval:
-                  description: SkipApproval skips the approval of the certificate.
-                  type: boolean
-                validityYears:
-                  description: ValidityYears is the validity of the certificate in
-                    years.
-                  type: integer
-              required:
-              - apiTokenReference
-              type: object
-            url:
-              description: Optional URL is the DigiCert cert-central API.
-              type: string
-          required:
-          - provisioner
-          type: object
-        status:
-          description: DigicertIssuerStatus defines the observed state of DigicertIssuer
-          properties:
-            conditions:
-              description: Conditions is a list of DigicertIssuerConditions describing
-                the current status.
-              items:
-                description: DigicertIssuerCondition  ...
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=="Ready")].status
+      name: Ready
+      type: boolean
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: DigicertIssuer is the Schema for the digicertissuers 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: DigicertIssuerSpec defines the desired state of DigicertIssuer
+            properties:
+              provisioner:
+                description: Provisioner contains the DigiCert provisioner configuration.
                 properties:
-                  lastTransitionTime:
-                    description: LastTransitionTime is the timestamp corresponding
-                      to the last status change of this condition.
-                    format: date-time
+                  apiTokenReference:
+                    description: APITokenReference references a secret in the same
+                      namespace containing the DigiCert API token.
+                    properties:
+                      key:
+                        description: The key in the secret.
+                        type: string
+                      name:
+                        description: The name of the secret.
+                        type: string
+                    required:
+                    - key
+                    - name
+                    type: object
+                  caCertID:
+                    description: CACertID is the ID of the CA if multiple CA certificates
+                      are configured in the (sub-)account.
                     type: string
-                  message:
-                    description: Message is a human readable description of the details
-                      of the last transition, complementing reason.
+                  containerID:
+                    description: ContainerID is the ID of the division
+                    type: integer
+                  disableRenewalNotifications:
+                    description: DisableRenewalNotifications disables email renewal
+                      notifications for expiring certificates.
+                    type: boolean
+                  orderType:
+                    description: OrderType is the certificate order type.
                     type: string
-                  reason:
-                    description: Reason is a brief machine readable explanation for
-                      the condition's last transition.
+                  organizationID:
+                    description: OrganizationID is the ID of the organization in Digicert.
+                    type: integer
+                  organizationName:
+                    description: OrganizationName is the name of the organization
+                      in Digicert. If specified takes precedence over OrganizationID.
                     type: string
-                  status:
-                    allOf:
-                    - enum:
-                      - "True"
-                      - "False"
-                      - Unknown
-                    - enum:
-                      - "True"
-                      - "False"
-                      - Unknown
-                    description: Status of the condition, one of ('True', 'False',
-                      'Unknown').
-                    type: string
-                  type:
-                    description: Type of the condition, currently ('Ready').
-                    enum:
-                    - Ready
+                  organizationUnits:
+                    description: OrganizationUnits is the list of organizational units.
+                    items:
+                      type: string
+                    type: array
+                  paymentMethod:
+                    description: PaymentMethod is the configured payment method in
+                      the Digicert account.
                     type: string
+                  skipApproval:
+                    description: SkipApproval skips the approval of the certificate.
+                    type: boolean
+                  validityYears:
+                    description: ValidityYears is the validity of the certificate
+                      in years.
+                    type: integer
                 required:
-                - status
-                - type
+                - apiTokenReference
                 type: object
-              type: array
-          type: object
-      required:
-      - spec
-      type: object
-  version: v1beta1
-  versions:
-  - name: v1beta1
+              url:
+                description: Optional URL is the DigiCert cert-central API.
+                type: string
+            required:
+            - provisioner
+            type: object
+          status:
+            description: DigicertIssuerStatus defines the observed state of DigicertIssuer
+            properties:
+              conditions:
+                description: Conditions is a list of DigicertIssuerConditions describing
+                  the current status.
+                items:
+                  description: DigicertIssuerCondition  ...
+                  properties:
+                    lastTransitionTime:
+                      description: LastTransitionTime is the timestamp corresponding
+                        to the last status change of this condition.
+                      format: date-time
+                      type: string
+                    message:
+                      description: Message is a human readable description of the
+                        details of the last transition, complementing reason.
+                      type: string
+                    reason:
+                      description: Reason is a brief machine readable explanation
+                        for the condition's last transition.
+                      type: string
+                    status:
+                      allOf:
+                      - enum:
+                        - "True"
+                        - "False"
+                        - Unknown
+                      - enum:
+                        - "True"
+                        - "False"
+                        - Unknown
+                      description: Status of the condition, one of ('True', 'False',
+                        'Unknown').
+                      type: string
+                    type:
+                      description: Type of the condition, currently ('Ready').
+                      enum:
+                      - Ready
+                      type: string
+                  required:
+                  - status
+                  - type
+                  type: object
+                type: array
+            type: object
+        required:
+        - spec
+        type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""