Update to Kubernetes v1.18.2 #207
Conversation
Signed-off-by: Tamal Saha <tamal@appscode.com>
- merge app.k8s.io_applications.yaml with app.k8s.io_applications.v1.yaml to get rid of the v1beta1 version of CRD - replace the deprecated apiextensions.k8s.io/v1beta1 version with apiextensions.k8s.io/v1beta1 - add `kubectl` to the PATH as the latest controller-gen depends on `kubectl` - remove `kind get kubeconfig-path --name="kind"` as `kubeconfig-path` was depracated in kind v0.8.1 - delete an empty file - update customerreource.go to use the v1 API instead of v1beta1 - add license to the generated resources - remove the extra `type` field from the test application.yaml file - add the `version` field to the test GVK
|
This PR was built on top of Tamal's PR: #199 with some fixes. Thank you, @tamalsaha for updating Kubernetes's version. |
k8s-ci-robot
added
the
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: nan-yu The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
size/XXL
| @@ -44,7 +44,7 @@ var _ = Describe("Application Reconciler", func() { | |||
| var labelSet1 = map[string]string{"foo": "bar"} | |||
| var labelSet2 = map[string]string{"baz": "qux"} | |||
| var namespace1 = metav1.NamespaceDefault | |||
| var namespace2 = "default2" | |||
| var namespace2 = "kube-system" | |||
There was a problem hiding this comment.
Not sure if we need this change?
There was a problem hiding this comment.
There was a problem hiding this comment.
Not if the tests pass. I could not find where this "default2" namespace was created.
There was a problem hiding this comment.
With controller-runtime upgraded from v0.4.0 to v0.6.0, the test failed with namespace not found error. I explicitly created the namespace in the test to avoid using the kube-system namespace.
Makefile
Outdated
| $(TOOLBIN)/controller-gen: | ||
| GOBIN=$(TOOLBIN) GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.5 | ||
| $(TOOLBIN)/controller-gen: $(TOOLBIN)/kubectl | ||
| GOBIN=$(TOOLBIN) GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 |
There was a problem hiding this comment.
Should this be updated to v0.4.0? When I originally created this commit, v0.4.0 was not out.
There was a problem hiding this comment.
controller-gen@v0.4.0 seems to be incompatible with client-go@v0.18.2. I got the following error when updating to v0.4.0:
17:14 $ make manifests
/usr/local/google/home/nanyu/go/src/sigs.k8s.io/application/hack/tools/bin/controller-gen \
"crd:trivialVersions=true,crdVersions=v1" \
rbac:roleName=kube-app-manager-role \
paths=./... \
output:crd:artifacts:config=config/crd/bases \
output:crd:dir=config/crd/bases \
output:webhook:dir=config/webhook \
webhook
../../../../pkg/mod/k8s.io/client-go@v0.18.2/discovery/discovery_client.go:30:2: module github.com/googleapis/gnostic@latest found (v0.5.1), but does not contain package github.com/googleapis/gnostic/OpenAPIv2
../../../../pkg/mod/k8s.io/kube-openapi@v0.0.0-20200805222855-6aeccd4b50c6/pkg/util/proto/document.go:24:2: case-insensitive import collision: "github.com/googleapis/gnostic/openapiv2" and "github.com/googleapis/gnostic/OpenAPIv2"
Error: not all generators ran successfully
run `controller-gen crd:trivialVersions=true,crdVersions=v1 rbac:roleName=kube-app-manager-role paths=./... output:crd:artifacts:config=config/crd/bases output:crd:dir=config/crd/bases output:webhook:dir=config/webhook webhook -w` to see all available markers, or `controller-gen crd:trivialVersions=true,crdVersions=v1 rbac:roleName=kube-app-manager-role paths=./... output:crd:artifacts:config=config/crd/bases output:crd:dir=config/crd/bases output:webhook:dir=config/webhook webhook -h` for usage
I would keep using v0.3.0 with K8s v1.18.2
There was a problem hiding this comment.
I refreshed all the dependencies and it worked now with controller-gen v0.4.0.
Makefile
Outdated
| @@ -59,16 +59,17 @@ $(TOOLBIN)/mockgen: | |||
| GOBIN=$(TOOLBIN) GO111MODULE=on go get github.com/golang/mock/mockgen@v1.3.1 | |||
|
|
|||
| $(TOOLBIN)/conversion-gen: | |||
| GOBIN=$(TOOLBIN) GO111MODULE=on go get k8s.io/code-generator/cmd/conversion-gen@v0.17.0 | |||
| GOBIN=$(TOOLBIN) GO111MODULE=on go get k8s.io/code-generator/cmd/conversion-gen@v0.18.2 | |||
There was a problem hiding this comment.
May be use the latest v0.18.9 ?
| @@ -8,7 +8,7 @@ VERSION_FILE ?= VERSION-DEV | |||
| include $(VERSION_FILE) | |||
|
|
|||
| # Produce CRDs that work back to Kubernetes 1.11 (no version conversion) | |||
| CRD_OPTIONS ?= "crd:trivialVersions=true" | |||
| CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1" | |||
There was a problem hiding this comment.
How far behind, the generated CRDs should be supported? crdVersions v1beta1 is still needed for kubernetes < 1.16
There was a problem hiding this comment.
I think it's up to the user to generate the v1beta1 version of the application CRD.
I added a comment to show how to set the CRD_OPTIONS for the v1beta1 version.
|
FWIW, lgtm . Thanks, @nan-yu ! |
No description provided.