Merge pull request #45 from smallstep/controller-gen-upgrade

Upgrade controller-gen and regenerate
smallstep · Oct 28, 2022 · 10a4e00 · 10a4e00
2 parents 271eeb6 + b9e87cd
commit 10a4e00
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 44 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ Q=$(if $V,,@)
 # Image URL to use all building/pushing image targets
 IMG ?= smallstep/step-issuer:latest
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true"
+CRD_OPTIONS ?= "crd"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -116,7 +116,7 @@ manifests: controller-gen
 # download controller-gen if necessary
 controller-gen:
 ifeq (, $(shell which controller-gen))
-	$Q go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0
+	$Q go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10.0
 CONTROLLER_GEN=$(GOBIN)/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)

diff --git a/config/crd/bases/certmanager.step.sm_stepclusterissuers.yaml b/config/crd/bases/certmanager.step.sm_stepclusterissuers.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.10.0
   creationTimestamp: null
   name: stepclusterissuers.certmanager.step.sm
 spec:
@@ -22,22 +21,29 @@ spec:
         description: StepClusterIssuer is the Schema for the stepclusterissuers 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'
+            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'
+            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: StepClusterIssuerSpec defines the desired state of StepClusterIssuer
             properties:
               caBundle:
-                description: CABundle is a base64 encoded TLS certificate used to verify connections to the step certificates server. If not set the system root certificates are used to validate the TLS connection.
+                description: CABundle is a base64 encoded TLS certificate used to
+                  verify connections to the step certificates server. If not set the
+                  system root certificates are used to validate the TLS connection.
                 format: byte
                 type: string
               provisioner:
-                description: Provisioner contains the step certificates provisioner configuration.
+                description: Provisioner contains the step certificates provisioner
+                  configuration.
                 properties:
                   kid:
                     description: KeyID is the kid property of the JWK provisioner.
@@ -46,16 +52,21 @@ spec:
                     description: Names is the name of the JWK provisioner.
                     type: string
                   passwordRef:
-                    description: PasswordRef is a reference to a Secret containing the provisioner password used to decrypt the provisioner private key.
+                    description: PasswordRef is a reference to a Secret containing
+                      the provisioner password used to decrypt the provisioner private
+                      key.
                     properties:
                       key:
-                        description: The key of the secret to select from. Must be a valid secret key.
+                        description: The key of the secret to select from. Must be
+                          a valid secret key.
                         type: string
                       name:
-                        description: The name of the secret in the pod's namespace to select from.
+                        description: The name of the secret in the pod's namespace
+                          to select from.
                         type: string
                       namespace:
-                        description: The namespace of the secret in the pod's namespace to select from.
+                        description: The namespace of the secret in the pod's namespace
+                          to select from.
                         type: string
                     required:
                     - name
@@ -78,17 +89,21 @@ spec:
             properties:
               conditions:
                 items:
-                  description: StepClusterIssuerCondition contains condition information for the step issuer.
+                  description: StepClusterIssuerCondition contains condition information
+                    for the step issuer.
                   properties:
                     lastTransitionTime:
-                      description: LastTransitionTime is the timestamp corresponding to the last status change of this condition.
+                      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.
+                      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.
+                      description: Reason is a brief machine readable explanation
+                        for the condition's last transition.
                       type: string
                     status:
                       allOf:
@@ -100,7 +115,8 @@ spec:
                         - "True"
                         - "False"
                         - Unknown
-                      description: Status of the condition, one of ('True', 'False', 'Unknown').
+                      description: Status of the condition, one of ('True', 'False',
+                        'Unknown').
                       type: string
                     type:
                       description: Type of the condition, currently ('Ready').
@@ -118,9 +134,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/certmanager.step.sm_stepissuers.yaml b/config/crd/bases/certmanager.step.sm_stepissuers.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.10.0
   creationTimestamp: null
   name: stepissuers.certmanager.step.sm
 spec:
@@ -22,22 +21,29 @@ spec:
         description: StepIssuer is the Schema for the stepissuers 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'
+            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'
+            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: StepIssuerSpec defines the desired state of StepIssuer
             properties:
               caBundle:
-                description: CABundle is a base64 encoded TLS certificate used to verify connections to the step certificates server. If not set the system root certificates are used to validate the TLS connection.
+                description: CABundle is a base64 encoded TLS certificate used to
+                  verify connections to the step certificates server. If not set the
+                  system root certificates are used to validate the TLS connection.
                 format: byte
                 type: string
               provisioner:
-                description: Provisioner contains the step certificates provisioner configuration.
+                description: Provisioner contains the step certificates provisioner
+                  configuration.
                 properties:
                   kid:
                     description: KeyID is the kid property of the JWK provisioner.
@@ -46,13 +52,17 @@ spec:
                     description: Names is the name of the JWK provisioner.
                     type: string
                   passwordRef:
-                    description: PasswordRef is a reference to a Secret containing the provisioner password used to decrypt the provisioner private key.
+                    description: PasswordRef is a reference to a Secret containing
+                      the provisioner password used to decrypt the provisioner private
+                      key.
                     properties:
                       key:
-                        description: The key of the secret to select from. Must be a valid secret key.
+                        description: The key of the secret to select from. Must be
+                          a valid secret key.
                         type: string
                       name:
-                        description: The name of the secret in the pod's namespace to select from.
+                        description: The name of the secret in the pod's namespace
+                          to select from.
                         type: string
                     required:
                     - name
@@ -74,17 +84,21 @@ spec:
             properties:
               conditions:
                 items:
-                  description: StepIssuerCondition contains condition information for the step issuer.
+                  description: StepIssuerCondition contains condition information
+                    for the step issuer.
                   properties:
                     lastTransitionTime:
-                      description: LastTransitionTime is the timestamp corresponding to the last status change of this condition.
+                      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.
+                      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.
+                      description: Reason is a brief machine readable explanation
+                        for the condition's last transition.
                       type: string
                     status:
                       allOf:
@@ -96,7 +110,8 @@ spec:
                         - "True"
                         - "False"
                         - Unknown
-                      description: Status of the condition, one of ('True', 'False', 'Unknown').
+                      description: Status of the condition, one of ('True', 'False',
+                        'Unknown').
                       type: string
                     type:
                       description: Type of the condition, currently ('Ready').
@@ -114,9 +129,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole