Bump kubernetes dependencies and apply required fixes

Gopkg.toml

@@ -82,17 +82,22 @@ required= [
   version = "2.8.2"
 
 [[constraint]]
-  name = "github.com/kubernetes-incubator/service-catalog"
-  version = "=v0.1.42"
+  name = "github.com/kubernetes-sigs/service-catalog"
+  version = "=v0.3.0-beta.2"
 
 [[constraint]]
   name="sigs.k8s.io/controller-runtime"
-  version = "=v0.1.12"
+  version = "=v0.4.0"
 
 [[constraint]]
   name = "github.com/kyma-project/kyma"
   revision = "eed4ed1c60440b9118f4a97a96d52efdd5a3a336"
 
+# Does not have official release yet
+[[constraint]]
+  name = "github.com/kyma-project/rafter"
+  revision = "2756b8f673dea4b25b0ee0ae12b384704588f438"
+
 [[constraint]]
   name = "github.com/SpectoLabs/hoverfly"
   revision = "fc31737b316a35bd2a15da3e36c1baa325e87854"
@@ -105,23 +110,33 @@ required= [
 
 [[override]]
   name="sigs.k8s.io/controller-tools"
-  version="v0.1.1"
+  version="=v0.2.4"
 
 [[override]]
   name = "k8s.io/api"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.16.4"
 
 [[override]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.16.4"
 
 [[override]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.13.4"
+  version = "kubernetes-1.16.4"
 
 [[override]]
   name = "k8s.io/code-generator"
-  version = "kubernetes-1.12.3"
+  # Needs to be at least 1.17 to solve the issue with ignoring the `genclient:nonNamespaced`
+  # https://github.com/kubernetes/kubernetes/issues/80457
+  version = "kubernetes-1.17.0"
+
+[[override]]
+  name="sigs.k8s.io/controller-runtime"
+  version = "=v0.4.0"
+
+[[override]]
+  name="golang.org/x/tools"
+  version = "gopls/v0.2.2"
 
 # For dependency below: Refer to issue https://github.com/golang/dep/issues/1799
 [[override]]

Makefile

@@ -32,17 +32,20 @@ else
 	mkdir -p licenses
 endif
 
-# Caution! Remove the “namespace: v.namespace” parameter after regeneration of
-# “components/helm-broker/pkg/client/informers/externalversions/addons/v1alpha1/interface.go” file.
-# clusterAddonsConfigurationInformer doesn’t have the “namespace” field
 .PHONY: generates
 # Generate CRD manifests, clients etc.
 generates: crd-manifests client
 
 .PHONY: crd-manifests
 # Generate CRD manifests
-crd-manifests:
-	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go crd --domain kyma-project.io
+crd-manifests: get-yaml-editor
+	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go crd paths=./pkg/apis/... output:crd:dir=charts/helm-broker/templates/crd
+	mv charts/helm-broker/templates/crd/addons.kyma-project.io_addonsconfigurations.yaml charts/helm-broker/templates/crd/addons-configuration.crd.yaml
+	mv charts/helm-broker/templates/crd/addons.kyma-project.io_clusteraddonsconfigurations.yaml charts/helm-broker/templates/crd/cluster-addons-configuration.crd.yaml
+	$(YAML_EDITOR) d -i charts/helm-broker/templates/crd/addons-configuration.crd.yaml metadata.annotations
+	$(YAML_EDITOR) w -i charts/helm-broker/templates/crd/addons-configuration.crd.yaml metadata.annotations["helm.sh/hook"]  "crd-install"
+	$(YAML_EDITOR) d -i charts/helm-broker/templates/crd/cluster-addons-configuration.crd.yaml metadata.annotations
+	$(YAML_EDITOR) w -i charts/helm-broker/templates/crd/cluster-addons-configuration.crd.yaml metadata.annotations["helm.sh/hook"]  "crd-install"
 
 .PHONY: client
 client:

config/crds/addonsconfiguration.yaml → charts/helm-broker/templates/crd/addons-configuration.crd.yaml

@@ -2,56 +2,77 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    controller-tools.k8s.io: "1.0"
   name: addonsconfigurations.addons.kyma-project.io
+  annotations:
+    helm.sh/hook: crd-install
 spec:
   group: addons.kyma-project.io
   names:
     categories:
     - all
     - addons
     kind: AddonsConfiguration
+    listKind: AddonsConfigurationList
     plural: addonsconfigurations
+    singular: addonsconfiguration
   scope: Namespaced
   subresources:
     status: {}
   validation:
     openAPIV3Schema:
+      description: AddonsConfiguration is the Schema for the addonsconfigurations
+        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: AddonsConfigurationSpec defines the desired state of AddonsConfiguration
           properties:
             repositories:
               items:
+                description: SpecRepository define the addon repository
                 properties:
                   secretRef:
-                    type: object
-                    required:
-                    - "name"
+                    description: SecretReference represents a Secret Reference. It
+                      has enough information to retrieve secret in any namespace
                     properties:
                       name:
+                        description: Name is unique within a namespace to reference
+                          a secret resource.
                         type: string
                       namespace:
+                        description: Namespace defines the space within which the
+                          secret name must be unique.
                         type: string
+                    type: object
                   url:
                     type: string
                 required:
                 - url
                 type: object
               type: array
             reprocessRequest:
+              description: 'ReprocessRequest is strictly increasing, non-negative
+                integer counter that can be incremented by a user to manually trigger
+                the reprocessing action of given CR. TODO: Use validation webhook
+                to block negative values, explanation: https://github.com/kubernetes/community/blob/db7f270f2d04b497767ebbc59c5aea595d67ea2c/contributors/devel/sig-architecture/api-conventions.md#primitive-types'
               format: int64
               type: integer
           required:
           - repositories
           type: object
         status:
+          description: AddonsConfigurationStatus defines the observed state of AddonsConfiguration
           properties:
             lastProcessedTime:
               format: date-time
@@ -60,12 +81,16 @@ spec:
               format: int64
               type: integer
             phase:
+              description: AddonsConfigurationPhase defines the addons configuration
+                phase
               type: string
             repositories:
               items:
+                description: StatusRepository define the addon repository
                 properties:
                   addons:
                     items:
+                      description: Addon holds information about single addon
                       properties:
                         message:
                           type: string
@@ -74,6 +99,7 @@ spec:
                         reason:
                           type: string
                         status:
+                          description: AddonStatus define the addon status
                           enum:
                           - Ready
                           - Failed
@@ -90,18 +116,24 @@ spec:
                   reason:
                     type: string
                   status:
+                    description: RepositoryStatus define the repository status
                     type: string
                   url:
                     type: string
                 required:
-                - url
                 - addons
+                - url
                 type: object
               type: array
           required:
           - phase
           type: object
+      type: object
   version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
 status:
   acceptedNames:
     kind: ""

config/crds/clusteraddonsconfiguration.yaml → charts/helm-broker/templates/crd/cluster-addons-configuration.crd.yaml

@@ -2,57 +2,76 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    controller-tools.k8s.io: "1.0"
   name: clusteraddonsconfigurations.addons.kyma-project.io
+  annotations:
+    helm.sh/hook: crd-install
 spec:
   group: addons.kyma-project.io
   names:
-    categories:
-    - all
-    - addons
     kind: ClusterAddonsConfiguration
+    listKind: ClusterAddonsConfigurationList
     plural: clusteraddonsconfigurations
+    singular: clusteraddonsconfiguration
   scope: Cluster
   subresources:
     status: {}
   validation:
     openAPIV3Schema:
+      description: ClusterAddonsConfiguration is the Schema for the addonsconfigurations
+        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: ClusterAddonsConfigurationSpec defines the desired state of
+            ClusterAddonsConfiguration
           properties:
             repositories:
               items:
+                description: SpecRepository define the addon repository
                 properties:
                   secretRef:
-                    type: object
-                    required:
-                    - "name"
-                    - "namespace"
+                    description: SecretReference represents a Secret Reference. It
+                      has enough information to retrieve secret in any namespace
                     properties:
                       name:
+                        description: Name is unique within a namespace to reference
+                          a secret resource.
                         type: string
                       namespace:
+                        description: Namespace defines the space within which the
+                          secret name must be unique.
                         type: string
+                    type: object
                   url:
                     type: string
                 required:
                 - url
                 type: object
               type: array
             reprocessRequest:
+              description: 'ReprocessRequest is strictly increasing, non-negative
+                integer counter that can be incremented by a user to manually trigger
+                the reprocessing action of given CR. TODO: Use validation webhook
+                to block negative values, explanation: https://github.com/kubernetes/community/blob/db7f270f2d04b497767ebbc59c5aea595d67ea2c/contributors/devel/sig-architecture/api-conventions.md#primitive-types'
               format: int64
               type: integer
           required:
           - repositories
           type: object
         status:
+          description: ClusterAddonsConfigurationStatus defines the observed state
+            of ClusterAddonsConfiguration
           properties:
             lastProcessedTime:
               format: date-time
@@ -61,12 +80,16 @@ spec:
               format: int64
               type: integer
             phase:
+              description: AddonsConfigurationPhase defines the addons configuration
+                phase
               type: string
             repositories:
               items:
+                description: StatusRepository define the addon repository
                 properties:
                   addons:
                     items:
+                      description: Addon holds information about single addon
                       properties:
                         message:
                           type: string
@@ -75,6 +98,7 @@ spec:
                         reason:
                           type: string
                         status:
+                          description: AddonStatus define the addon status
                           enum:
                           - Ready
                           - Failed
@@ -91,18 +115,24 @@ spec:
                   reason:
                     type: string
                   status:
+                    description: RepositoryStatus define the repository status
                     type: string
                   url:
                     type: string
                 required:
-                - url
                 - addons
+                - url
                 type: object
               type: array
           required:
           - phase
           type: object
+      type: object
   version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
 status:
   acceptedNames:
     kind: ""