Upgrade controller-gen, crds and golangci-lint.

Makefile

@@ -16,7 +16,7 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
-all: build test lint
+all: build lint test
 
 .PHONY: all
 
@@ -26,7 +26,7 @@ all: build test lint
 
 bootstra%:
 	# Using a released version of golangci-lint to take into account custom replacements in their go.mod
-	$Q curl -sSfL https://raw.githubusercontent.com/smallstep/cli/master/make/golangci-install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.23.8
+	$Q curl -sSfL https://raw.githubusercontent.com/smallstep/cli/master/make/golangci-install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.39.0
 
 .PHONY: bootstra%
 
@@ -77,10 +77,7 @@ GOFLAGS := CGO_ENABLED=0
 build: $(PREFIX)bin/$(BINNAME)
 	@echo "Build Complete!"
 
-download:
-	$Q go mod download
-
-$(PREFIX)bin/$(BINNAME): download generate $(call rwildcard,*.go)
+$(PREFIX)bin/$(BINNAME): generate $(call rwildcard,*.go)
 	$Q mkdir -p $(@D)
 	$Q $(GOOS_OVERRIDE) $(GOFLAGS) go build -v -o $(PREFIX)bin/$(BINNAME) $(LDFLAGS) $(PKG)
 
@@ -96,7 +93,7 @@ generate: controller-gen
 # download controller-gen if necessary
 controller-gen:
 ifeq (, $(shell which controller-gen))
-	$Q go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.5
+	$Q go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0
 CONTROLLER_GEN=$(GOBIN)/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)

README.md

@@ -117,7 +117,7 @@ running `make deploy`, but we're going to run the individual steps here:
 First we install the CRDs:
 
 ```sh
-kubectl apply -f config/crd/bases
+kubectl apply -f config/crd/bases/certmanager.step.sm_stepissuers.yaml
 ```
 
 Then we install the controller:

config/crd/bases/certmanager.step.sm_stepissuers.yaml

 
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.5
+    controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
   name: stepissuers.certmanager.step.sm
 spec:
@@ -15,121 +15,121 @@ spec:
     plural: stepissuers
     singular: stepissuer
   scope: Namespaced
-  subresources:
-    status: {}
-  validation:
-    openAPIV3Schema:
-      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'
-          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: 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.
-              format: byte
-              type: string
-            provisioner:
-              description: Provisioner contains the step certificates provisioner
-                configuration.
-              properties:
-                kid:
-                  description: KeyID is the kid property of the JWK provisioner.
-                  type: string
-                name:
-                  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.
-                  properties:
-                    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.
-                      type: string
-                  required:
-                  - name
-                  type: object
-              required:
-              - kid
-              - name
-              - passwordRef
-              type: object
-            url:
-              description: URL is the base URL for the step certificates instance.
-              type: string
-          required:
-          - provisioner
-          - url
-          type: object
-        status:
-          description: StepIssuerStatus defines the observed state of StepIssuer
-          properties:
-            conditions:
-              items:
-                description: StepIssuerCondition contains condition information for
-                  the step issuer.
+  versions:
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        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'
+            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: 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.
+                format: byte
+                type: string
+              provisioner:
+                description: Provisioner contains the step certificates provisioner
+                  configuration.
                 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').
+                  kid:
+                    description: KeyID is the kid property of the JWK provisioner.
                     type: string
-                  type:
-                    description: Type of the condition, currently ('Ready').
-                    enum:
-                    - Ready
+                  name:
+                    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.
+                    properties:
+                      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.
+                        type: string
+                    required:
+                    - name
+                    type: object
                 required:
-                - status
-                - type
+                - kid
+                - name
+                - passwordRef
                 type: object
-              type: array
-          type: object
-      type: object
-  version: v1beta1
-  versions:
-  - name: v1beta1
+              url:
+                description: URL is the base URL for the step certificates instance.
+                type: string
+            required:
+            - provisioner
+            - url
+            type: object
+          status:
+            description: StepIssuerStatus defines the observed state of StepIssuer
+            properties:
+              conditions:
+                items:
+                  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.
+                      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
+        type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""

go.mod

@@ -5,10 +5,12 @@ go 1.13
 require (
 	github.com/go-logr/logr v0.3.0
 	github.com/jetstack/cert-manager v1.3.1
+	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/onsi/ginkgo v1.14.1
 	github.com/onsi/gomega v1.10.2
 	github.com/smallstep/certificates v0.14.2
 	k8s.io/api v0.20.2
+	k8s.io/apiextensions-apiserver v0.20.2 // indirect
 	k8s.io/apimachinery v0.20.2
 	k8s.io/client-go v0.20.2
 	k8s.io/utils v0.0.0-20210111153108-fddb29f9d009