Bump kube 1.16

Gopkg.toml

@@ -22,34 +22,34 @@ required = [
 
 [[override]]
   name = "k8s.io/code-generator"
-  version = "kubernetes-1.14.1"
+  version = "kubernetes-1.16.0"
 
 [[override]]
   name = "k8s.io/api"
-  version = "kubernetes-1.14.1"
+  version = "kubernetes-1.16.0"
 
 [[override]]
   name = "k8s.io/apiextensions-apiserver"
-  version = "kubernetes-1.14.1"
+  version = "kubernetes-1.16.0"
 
 [[override]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.14.1"
+  version = "kubernetes-1.16.0"
 
 [[override]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.14.1"
+  version = "kubernetes-1.16.0"
 
 # STANZAS BELOW ARE GENERATED AND MAY BE WRITTEN - DO NOT MODIFY BELOW THIS LINE.
 
 [[constraint]]
   name = "sigs.k8s.io/controller-runtime"
-  # release-0.2 since it imports kubernetes 1.14
-  branch="release-0.2"
+  source = "github.com/enxebre/controller-runtime"
+  branch="kube-1.16.0"
 
 [[constraint]]
   name="sigs.k8s.io/controller-tools"
-  version="v0.1.9"
+  branch="master"
 
 # For dependency below: Refer to issue https://github.com/golang/dep/issues/1799
 [[override]]

Makefile

@@ -42,7 +42,8 @@ dep-ensure: ## Runs dep-ensure and rebuilds Bazel gazelle files.
 
 .PHONY: test
 test: gazelle verify generate fmt vet manifests ## Run tests
-	go test -v -timeout=20m -tags=integration ./pkg/... ./cmd/...
+    # TODO(alberto) remove unused code carried over from upstream.
+	go test -v -timeout=20m -tags=integration ./pkg/... ./cmd/manager/...
 
 .PHONY: manager
 manager: generate fmt vet ## Build manager binary
@@ -62,11 +63,9 @@ deploy: manifests ## Deploy controller in the configured Kubernetes cluster in ~
 
 .PHONY: manifests
 manifests: ## Generate manifests e.g. CRD, RBAC etc.
-	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go all
-	cp -f ./config/rbac/rbac*.yaml ./config/ci/rbac/
-	cp -f ./config/manager/manager*.yaml ./config/ci/manager/
-	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go crd --domain openshift.io
-	git checkout config/crds/cluster_v1alpha1_*
+	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go crd \
+	    paths=./pkg/apis/machine/... \
+	    output:crd:dir=./config/crds
 
 .PHONY: fmt
 fmt: ## Run go fmt against code

config/crds/machine_v1beta1_machineclass.yaml → config/crds/machine.openshift.io_machineclasses.yaml

@@ -1,28 +1,32 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    controller-tools.k8s.io: "1.0"
   name: machineclasses.machine.openshift.io
 spec:
   group: machine.openshift.io
   names:
     kind: MachineClass
+    listKind: MachineClassList
     plural: machineclasses
-  scope: Namespaced
+    singular: machineclass
+  scope: ""
   validation:
     openAPIV3Schema:
+      description: / [MachineClass] MachineClass can be used to templatize and re-use
+        provider configuration across multiple Machines / MachineSets / MachineDeployments.
       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/api-conventions.md#resources'
+            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/api-conventions.md#types-kinds'
+            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
@@ -31,7 +35,12 @@ spec:
           type: object
       required:
       - providerSpec
+      type: object
   version: v1beta1
+  versions:
+  - name: v1beta1
+    served: true
+    storage: true
 status:
   acceptedNames:
     kind: ""

config/crds/machine_v1beta1_machinedeployment.yaml → config/crds/machine.openshift.io_machinedeployments.yaml

@@ -1,16 +1,18 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   creationTimestamp: null
-  labels:
-    controller-tools.k8s.io: "1.0"
   name: machinedeployments.machine.openshift.io
 spec:
   group: machine.openshift.io
   names:
     kind: MachineDeployment
+    listKind: MachineDeploymentList
     plural: machinedeployments
-  scope: Namespaced
+    singular: machinedeployment
+  scope: ""
   subresources:
     scale:
       labelSelectorPath: .status.labelSelector
@@ -19,20 +21,24 @@ spec:
     status: {}
   validation:
     openAPIV3Schema:
+      description: / [MachineDeployment] MachineDeployment is the Schema for the machinedeployments
+        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/api-conventions.md#resources'
+            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/api-conventions.md#types-kinds'
+            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: / [MachineDeploymentSpec] MachineDeploymentSpec defines the
+            desired state of MachineDeployment
           properties:
             minReadySeconds:
               description: Minimum number of seconds for which a newly created machine
@@ -67,6 +73,46 @@ spec:
               description: Label selector for machines. Existing MachineSets whose
                 machines are selected by this will be the ones affected by this deployment.
                 It must match the machine template's labels.
+              properties:
+                matchExpressions:
+                  description: matchExpressions is a list of label selector requirements.
+                    The requirements are ANDed.
+                  items:
+                    description: A label selector requirement is a selector that contains
+                      values, a key, and an operator that relates the key and values.
+                    properties:
+                      key:
+                        description: key is the label key that the selector applies
+                          to.
+                        type: string
+                      operator:
+                        description: operator represents a key's relationship to a
+                          set of values. Valid operators are In, NotIn, Exists and
+                          DoesNotExist.
+                        type: string
+                      values:
+                        description: values is an array of string values. If the operator
+                          is In or NotIn, the values array must be non-empty. If the
+                          operator is Exists or DoesNotExist, the values array must
+                          be empty. This array is replaced during a strategic merge
+                          patch.
+                        items:
+                          type: string
+                        type: array
+                    required:
+                    - key
+                    - operator
+                    type: object
+                  type: array
+                matchLabels:
+                  additionalProperties:
+                    type: string
+                  description: matchLabels is a map of {key,value} pairs. A single
+                    {key,value} in the matchLabels map is equivalent to an element
+                    of matchExpressions, whose key field is "key", the operator is
+                    "In", and the values array contains only "value". The requirements
+                    are ANDed.
+                  type: object
               type: object
             strategy:
               description: The deployment strategy to use to replace existing machines
@@ -167,17 +213,41 @@ spec:
                         manually remove the taint the machine controller will put
                         it back) but not have the machine controller remove any taints
                       items:
+                        description: The node this Taint is attached to has the "effect"
+                          on any pod that does not tolerate the Taint.
+                        properties:
+                          effect:
+                            description: Required. The effect of the taint on pods
+                              that do not tolerate the taint. Valid effects are NoSchedule,
+                              PreferNoSchedule and NoExecute.
+                            type: string
+                          key:
+                            description: Required. The taint key to be applied to
+                              a node.
+                            type: string
+                          timeAdded:
+                            description: TimeAdded represents the time at which the
+                              taint was added. It is only written for NoExecute taints.
+                            format: date-time
+                            type: string
+                          value:
+                            description: Required. The taint value corresponding to
+                              the taint key.
+                            type: string
+                        required:
+                        - effect
+                        - key
                         type: object
                       type: array
-                  required:
-                  - providerSpec
                   type: object
               type: object
           required:
           - selector
           - template
           type: object
         status:
+          description: / [MachineDeploymentStatus] MachineDeploymentStatus defines
+            the observed state of MachineDeployment
           properties:
             availableReplicas:
               description: Total number of available machines (ready for at least
@@ -211,7 +281,12 @@ spec:
               format: int32
               type: integer
           type: object
+      type: object
   version: v1beta1
+  versions:
+  - name: v1beta1
+    served: true
+    storage: true
 status:
   acceptedNames:
     kind: ""