Bunm version v0.3.0 (#17)

CHANGELOG.md

@@ -5,6 +5,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.3.0] - 2021-07-03
+
+### Added
+
+- Feature AfterBuildScript by using batchc1/Job ([#16](https://github.com/zoetrope/website-operator/pull/16))
+
+### Changed
+
+- Update controller-runtime to v0.9.2 ([#14](https://github.com/zoetrope/website-operator/pull/14))
+- Fix RevisionWatcher is passing of incorrect address ([#15](https://github.com/zoetrope/website-operator/pull/15))
+
 ## [0.2.2] - 2021-03-04
 
 ### Added
@@ -63,7 +74,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This is the first public release.
 
-[Unreleased]: https://github.com/zoetrope/website-operator/compare/v0.2.2...HEAD
+[Unreleased]: https://github.com/zoetrope/website-operator/compare/v0.3.0...HEAD
+[0.3.0]: https://github.com/zoetrope/website-operator/compare/v0.2.2...v0.3.0
 [0.2.2]: https://github.com/zoetrope/website-operator/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/zoetrope/website-operator/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/zoetrope/website-operator/compare/v0.1.2...v0.2.0

README.md

@@ -10,7 +10,7 @@ All resources (Namespace, CustomResourceDefinitions, Deployment and RBACs) are i
 You can just install the manifest as follows:
 
 ```console
-kubectl apply -f https://github.com/zoetrope/website-operator/releases/download/v0.2.2/install.yaml
+kubectl apply -f https://github.com/zoetrope/website-operator/releases/latest/download/install.yaml
 ```
 
 ## Usage

common.mk

@@ -1,7 +1,7 @@
-KUBERNETES_VERSION := 1.20.2
-KUBEBUILDER_VERSION := 3.0.0-beta.0
-CTRLTOOLS_VERSION := 0.5.0
-KIND_VERSION := 0.10.0
-KUSTOMIZE_VERSION := 4.0.1
+KUBERNETES_VERSION := 1.21.1
+KUBEBUILDER_VERSION := 3.1.0
+CTRLTOOLS_VERSION := 0.6.1
+KIND_VERSION := 0.11.1
+KUSTOMIZE_VERSION := 4.2.0
 
 REGISTRY := ghcr.io/zoetrope/

config/crd/bases/website.zoetrope.github.io_websites.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.6.0
+    controller-gen.kubebuilder.io/version: v0.6.1
   creationTimestamp: null
   name: websites.website.zoetrope.github.io
 spec:

config/release/kustomization.yaml

@@ -8,6 +8,6 @@ patchesStrategicMerge:
   - ui.yaml
 images:
   - name: ghcr.io/zoetrope/website-operator
-    newTag: 0.2.2
+    newTag: 0.3.0
   - name: ghcr.io/zoetrope/website-operator-ui
-    newTag: 0.2.2
+    newTag: 0.3.0

e2e/Makefile

@@ -1,19 +1,21 @@
 include ../common.mk
 
-KUBECTL := $(PWD)/bin/kubectl
-KUSTOMIZE := $(PWD)/bin/kustomize
+BINDIR = $(PWD)/bin
+KIND := $(BINDIR)/kind
+KUBECTL := $(BINDIR)/kubectl
+KUSTOMIZE := $(BINDIR)/kustomize
 KIND_CLUSTER_NAME=website-e2e
 
 GO_FILES := $(shell find .. -path ../vendor -prune -o -path ../e2e -prune -o -name '*.go' -print)
 
-launch-kind: kind
-	if [ ! "$(shell kind get clusters | grep $(KIND_CLUSTER_NAME))" ]; then \
-		kind create cluster --name=$(KIND_CLUSTER_NAME) --config kind-config.yaml --image kindest/node:v$(KUBERNETES_VERSION) --wait 180s; \
+launch-kind: $(KIND)
+	if [ ! "$(shell $(KIND) get clusters | grep $(KIND_CLUSTER_NAME))" ]; then \
+		$(KIND) create cluster --name=$(KIND_CLUSTER_NAME) --config kind-config.yaml --image kindest/node:v$(KUBERNETES_VERSION) --wait 180s; \
 	fi
 
-shutdown-kind: kind
-	if [ "$(shell kind get clusters | grep $(KIND_CLUSTER_NAME))" ]; then \
-		kind delete cluster --name=$(KIND_CLUSTER_NAME) || true; \
+shutdown-kind: $(KIND)
+	if [ "$(shell $(KIND) get clusters | grep $(KIND_CLUSTER_NAME))" ]; then \
+		$(KIND) delete cluster --name=$(KIND_CLUSTER_NAME) || true; \
 	fi
 
 setup-cluster: $(KUBECTL)
@@ -43,41 +45,51 @@ load-operator-images:
 	cd ../ && make build-operator-image TAG=dev
 	ID=$$(docker image inspect --format='{{.ID}}' $(REGISTRY)website-operator:dev); \
 	if [ ! "$$(docker exec -it $(KIND_CLUSTER_NAME)-control-plane ctr --namespace=k8s.io images list | grep $$ID)" ]; then \
-		kind load docker-image --name=$(KIND_CLUSTER_NAME) $(REGISTRY)website-operator:dev; \
+		$(KIND) load docker-image --name=$(KIND_CLUSTER_NAME) $(REGISTRY)website-operator:dev; \
 	fi
 
 .PHONY: load-checker-images
 load-checker-image:
 	cd ../ && make build-checker-image TAG=dev
 	ID=$$(docker image inspect --format='{{.ID}}' $(REGISTRY)repo-checker:dev); \
 	if [ ! "$$(docker exec -it $(KIND_CLUSTER_NAME)-control-plane ctr --namespace=k8s.io images list | grep $$ID)" ]; then \
-		kind load docker-image --name=$(KIND_CLUSTER_NAME) $(REGISTRY)repo-checker:dev; \
+		$(KIND) load docker-image --name=$(KIND_CLUSTER_NAME) $(REGISTRY)repo-checker:dev; \
 	fi
 
 .PHONY: load-ui-images
 load-ui-image:
 	cd ../ && make build-ui-image TAG=dev
 	ID=$$(docker image inspect --format='{{.ID}}' $(REGISTRY)website-operator-ui:dev); \
 	if [ ! "$$(docker exec -it $(KIND_CLUSTER_NAME)-control-plane ctr --namespace=k8s.io images list | grep $$ID)" ]; then \
-		kind load docker-image --name=$(KIND_CLUSTER_NAME) $(REGISTRY)website-operator-ui:dev; \
+		$(KIND) load docker-image --name=$(KIND_CLUSTER_NAME) $(REGISTRY)website-operator-ui:dev; \
 	fi
 
 $(KUBECTL):
-	mkdir -p bin
+	mkdir -p $(BINDIR)
 	curl -sfL https://storage.googleapis.com/kubernetes-release/release/v$(KUBERNETES_VERSION)/bin/linux/amd64/kubectl -o $(KUBECTL)
 	chmod 755 $(KUBECTL)
 
 $(KUSTOMIZE):
-	mkdir -p bin
+	mkdir -p $(BINDIR)
 	curl -sSLf https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v$(KUSTOMIZE_VERSION)/kustomize_v$(KUSTOMIZE_VERSION)_linux_amd64.tar.gz | tar xzf - > kustomize
 	mv kustomize $(KUSTOMIZE)
 
-.PHONY: kind
-kind:
-	if [ ! "$(shell kind version | grep $(KIND_VERSION))" ]; then \
-		cd /tmp; env GOFLAGS= GO111MODULE=on go get sigs.k8s.io/kind@v$(KIND_VERSION); \
-	fi
+$(KIND):
+	mkdir -p $(BINDIR)
+	$(call go-install-tool,$(KIND),sigs.k8s.io/kind@v$(KIND_VERSION))
 
 .PHONY: clean
 clean:
-	rm -rf bin
+	rm -rf $(BINDIR)
+
+define go-install-tool
+@[ -f $(1) ] || { \
+set -e ;\
+TMP_DIR=$$(mktemp -d) ;\
+cd $$TMP_DIR ;\
+go mod init tmp ;\
+echo "Downloading $(2)" ;\
+GOBIN=$(BINDIR) go install $(2) ;\
+rm -rf $$TMP_DIR ;\
+}
+endef

go.mod

@@ -5,31 +5,21 @@ go 1.15
 require (
 	github.com/cybozu-go/log v1.6.0
 	github.com/cybozu-go/well v1.10.0
-	github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 // indirect
-	github.com/fatih/color v1.12.0 // indirect
 	github.com/go-logr/logr v0.4.0
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.13.0
-	github.com/spf13/cobra v1.1.3
-	go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee // indirect
-	go.uber.org/zap v1.17.0 // indirect
-	golang.org/x/mod v0.4.2 // indirect
-	golang.org/x/net v0.0.0-20210610132358-84b48f89b13b // indirect
-	golang.org/x/sys v0.0.0-20210611083646-a4fc73990273 // indirect
-	golang.org/x/text v0.3.6 // indirect
-	golang.org/x/tools v0.1.3 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	gotest.tools v2.2.0+incompatible // indirect
-	k8s.io/api v0.21.1
-	k8s.io/apiextensions-apiserver v0.21.1 // indirect
-	k8s.io/apimachinery v0.21.1
-	k8s.io/client-go v0.21.1
+	github.com/spf13/cobra v1.2.1
+	go.uber.org/zap v1.18.1
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
+	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
+	k8s.io/api v0.21.2
+	k8s.io/apimachinery v0.21.2
+	k8s.io/client-go v0.21.2
 	k8s.io/klog/v2 v2.9.0 // indirect
-	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
-	sigs.k8s.io/controller-runtime v0.9.0
-	sigs.k8s.io/controller-tools v0.6.0
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.1 // indirect
+	k8s.io/utils v0.0.0-20210629042839-4a2b36d8d73f
+	sigs.k8s.io/controller-runtime v0.9.2
+	sigs.k8s.io/controller-tools v0.6.1
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
 	sigs.k8s.io/yaml v1.2.0
 )