guestbook-operator: update controller-gen

Author: justinsb

examples/guestbook-operator/Makefile

@@ -1,8 +1,8 @@
 
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
-# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
+# Produce v1 CRDs
+CRD_OPTIONS ?= "crd:crdVersions=v1"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -98,7 +98,7 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.4.1
+CONTROLLER_TOOLS_VERSION ?= v0.17.3
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize

examples/guestbook-operator/api/v1alpha1/zz_generated.deepcopy.go

@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.17.3
   name: guestbooks.addons.example.org
 spec:
   group: addons.example.org
@@ -22,31 +20,40 @@ spec:
         description: Guestbook is the Schema for the guestbooks 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: GuestbookSpec defines the desired state of Guestbook
             properties:
               channel:
-                description: 'Channel specifies a channel that can be used to resolve
-                  a specific addon, eg: stable It will be ignored if Version is specified'
+                description: |-
+                  Channel specifies a channel that can be used to resolve a specific addon, eg: stable
+                  It will be ignored if Version is specified
                 type: string
               patches:
                 items:
                   type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 type: array
+                x-kubernetes-preserve-unknown-fields: true
               version:
-                description: Version specifies the exact addon version to be deployed,
-                  eg 1.2.3 It should not be specified if Channel is specified
+                description: |-
+                  Version specifies the exact addon version to be deployed, eg 1.2.3
+                  It should not be specified if Channel is specified
                 type: string
             type: object
           status:
@@ -58,19 +65,18 @@ spec:
                 type: array
               healthy:
                 type: boolean
+              observedGeneration:
+                default: 0
+                format: int64
+                type: integer
               phase:
                 type: string
             required:
             - healthy
+            - observedGeneration
             type: object
         type: object
     served: true
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

examples/guestbook-operator/config/crd/bases/addons.example.org_guestbooks.yaml

@@ -1,9 +1,7 @@
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups: