bump openyurt version to v0.6.1 (#22)

* bump openyurt version to v0.6.1

* makefile: download kustomize if not exists

Author: SataQiu

Makefile

@@ -45,27 +45,27 @@ run: generate fmt vet manifests
 	go run --ldflags "${GO_LD_FLAGS}" ./cmd/manager/manager.go
 
 # Install CRDs into a cluster
-install: manifests
-	kustomize build config/crd | kubectl apply -f -
+install: manifests kustomize
+	$(KUSTOMIZE) build config/crd | kubectl apply -f -
 
 # Uninstall CRDs from a cluster
-uninstall: manifests
-	kustomize build config/crd | kubectl delete -f -
+uninstall: manifests kustomize
+	$(KUSTOMIZE) build config/crd | kubectl delete -f -
 
 # Deploy controller in the configured Kubernetes cluster in ~/.kube/config
-deploy: manifests
-	cd config/manager && kustomize edit set image yurtcluster-operator-manager=${MANAGER_IMG}
-	cd config/agent && kustomize edit set image yurtcluster-operator-agent=${AGENT_IMG}
-	kustomize build config/default | kubectl apply -f -
+deploy: manifests kustomize
+	cd config/manager && $(KUSTOMIZE) edit set image yurtcluster-operator-manager=${MANAGER_IMG}
+	cd config/agent && $(KUSTOMIZE) edit set image yurtcluster-operator-agent=${AGENT_IMG}
+	$(KUSTOMIZE) build config/default | kubectl apply -f -
 
 # Release manifests into docs/manifests and push docker image to dockerhub
 release-artifacts: docker-push release-manifests
 
 # Release manifests into docs/manifests
-release-manifests: manifests
-	cd config/manager && kustomize edit set image yurtcluster-operator-manager=${MANAGER_IMG}
-	cd config/agent && kustomize edit set image yurtcluster-operator-agent=${AGENT_IMG}
-	kustomize build config/default > docs/manifests/deploy.yaml
+release-manifests: manifests kustomize
+	cd config/manager && $(KUSTOMIZE) edit set image yurtcluster-operator-manager=${MANAGER_IMG}
+	cd config/agent && $(KUSTOMIZE) edit set image yurtcluster-operator-agent=${AGENT_IMG}
+	$(KUSTOMIZE) build config/default > docs/manifests/deploy.yaml
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
@@ -118,7 +118,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.5 ;\
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen
@@ -141,3 +141,19 @@ GOLANGCI_LINT=$(GOBIN)/golangci-lint
 else
 GOLANGCI_LINT=$(shell which golangci-lint)
 endif
+
+# find or download kustomize
+kustomize:
+ifeq (, $(shell which kustomize))
+	@{ \
+	set -e ;\
+	KUSTOMIZE_TMP_DIR=$$(mktemp -d) ;\
+	cd $$KUSTOMIZE_TMP_DIR ;\
+	go mod init tmp ;\
+	go get sigs.k8s.io/kustomize/kustomize/[email protected] ;\
+	rm -rf $$KUSTOMIZE_TMP_DIR ;\
+	}
+KUSTOMIZE=$(GOBIN)/kustomize
+else
+KUSTOMIZE=$(shell which kustomize)
+endif

api/v1alpha1/defaults.go

@@ -22,7 +22,7 @@ import (
 
 const (
 	// DefaultYurtVersion defines the default yurt version (image tag)
-	DefaultYurtVersion = "v0.6.0"
+	DefaultYurtVersion = "v0.6.1"
 
 	// DefaultYurtImageRepository defines the default repository for the yurt component images
 	DefaultYurtImageRepository = "docker.io/openyurt"

charts/charts/yurt-controller-manager/values.yaml

@@ -4,7 +4,7 @@
 
 manager:
   replicas: 3
-  image: "openyurt/yurt-controller-manager:v0.6.0"
+  image: "openyurt/yurt-controller-manager:v0.6.1"
   imagePullPolicy: IfNotPresent
   nodeSelector:
     openyurt.io/is-edge-worker: "false"

charts/values.yaml

@@ -18,7 +18,7 @@ agent:
 yurt-controller-manager:
   manager:
     replicas: 3
-    image: "openyurt/yurt-controller-manager:v0.6.0"
+    image: "openyurt/yurt-controller-manager:v0.6.1"
     imagePullPolicy: IfNotPresent
     nodeSelector:
       openyurt.io/is-edge-worker: "false"

config/samples/operator_v1alpha1_yurtcluster.yaml

@@ -3,7 +3,7 @@ kind: YurtCluster
 metadata:
   name: cluster
 spec:
-  yurtVersion: "v0.6.0"
+  yurtVersion: "v0.6.1"
   cloudNodes:
     selector:
       nodeSelectorTerms: