Merge branch 'master' into cluster-scope

Author: Strangerxxx

.gitignore

@@ -6,4 +6,5 @@ logs
 vendor/
 .idea/
 deps/
-.vscode/
+.vscode/
+**/*.enterprise.go

CHANGELOG.md

@@ -1,6 +1,46 @@
 # Change Log
 
 ## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
+- Replace `beta.kubernetes.io/arch` Pod label with `kubernetes.io/arch` using Silent Rotation
+- Add "Short Names" feature
+- Switch ArangoDB Image Discovery process from Headless Service to Pod IP
+- Fix PVC Resize for Single servers
+- Add Topology support
+
+## [1.2.3](https://github.com/arangodb/kube-arangodb/tree/1.2.3) (2021-09-24)
+- Update UBI Image to 8.4
+- Fix ArangoSync Liveness Probe
+- Allow runtime update of Sidecar images
+- Allow Agent recreation with preserved IDs
+- The internal metrics exporter can not be disabled
+- Changing the topics' log level without restarting the container.
+  When the topic is removed from the argument list then it will not 
+  be turned off in the ArangoDB automatically.
+- Allow to customize SchedulerName inside Member Pod
+- Add Enterprise Edition support
+
+## [1.2.2](https://github.com/arangodb/kube-arangodb/tree/1.2.2) (2021-09-09)
+- Update 'github.com/arangodb/arangosync-client' dependency to v0.7.0
+- Add HighPriorityPlan to ArangoDeployment Status
+- Add Pending Member phase
+- Add Ephemeral Volumes for apps feature
+- Check if the DB server is cleaned out.
+- Render Pod Template in ArangoMember Spec and Status
+- Add Pod PropagationModes
+- Fix MemberUp action for ActiveFailover
+
+## [1.2.1](https://github.com/arangodb/kube-arangodb/tree/1.2.1) (2021-07-28)
+- Fix ArangoMember race with multiple ArangoDeployments within single namespace
+- Allow to define Member Recreation Policy within group
+- Replace 'github.com/dgrijalva/jwt-go' with 'github.com/golang-jwt/jwt'
+- Update 'github.com/gin-gonic/gin' dependency to v1.7.2
+
+## [1.2.0](https://github.com/arangodb/kube-arangodb/tree/1.2.0) (2021-07-16)
+- Enable "Operator Internal Metrics Exporter" by default
+- Enable "Operator Maintenance Management Support" by default
+- Add Operator `/api/v1/version` endpoint
+
+## [1.1.10](https://github.com/arangodb/kube-arangodb/tree/1.1.10) (2021-07-06)
 - Switch K8S CRD API to V1
 - Deprecate Alpine image usage
 - Use persistent name and namespace in ArangoDeployment reconcilation loop

Dockerfile.ubi

@@ -1,4 +1,4 @@
-ARG IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.0
+ARG IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.4
 FROM ${IMAGE}
 
 RUN microdnf update && microdnf clean all

Makefile

@@ -10,11 +10,13 @@ VERSION_MAJOR_MINOR := $(shell echo $(VERSION_MAJOR_MINOR_PATCH) | cut -f 1,2 -d
 VERSION_MAJOR := $(shell echo $(VERSION_MAJOR_MINOR) | cut -f 1 -d '.')
 COMMIT := $(shell git rev-parse --short HEAD)
 DOCKERCLI := $(shell which docker)
+RELEASE_MODE ?= community
 
 GOBUILDDIR := $(SCRIPTDIR)/.gobuild
 SRCDIR := $(SCRIPTDIR)
 CACHEVOL := $(PROJECT)-gocache
 BINDIR := $(ROOTDIR)/bin
+VBINDIR := $(BINDIR)/$(RELEASE_MODE)
 VENDORDIR := $(ROOTDIR)/deps
 DASHBOARDDIR := $(ROOTDIR)/dashboard
 
@@ -30,6 +32,8 @@ GOVERSION := 1.10.0-alpine
 PULSAR := $(GOBUILDDIR)/bin/pulsar$(shell go env GOEXE)
 GOASSETSBUILDER := $(GOBUILDDIR)/bin/go-assets-builder$(shell go env GOEXE)
 
+BUILDTIME = $(shell go run "$(ROOT)/tools/dategen/")
+
 DOCKERFILE := Dockerfile
 
 HELM ?= $(shell which helm)
@@ -46,7 +50,7 @@ endif
 
 HELM_PACKAGE_CMD = $(HELM) package "$(ROOTDIR)/chart/$(CHART_NAME)" \
                            -d "$(ROOTDIR)/bin/charts" \
-                           --save=false
+                           --save=false --version "$(VERSION_MAJOR_MINOR_PATCH)"
 
 HELM_CMD = $(HELM) template "$(ROOTDIR)/chart/$(CHART_NAME)" \
          	       --name "$(NAME)" \
@@ -91,13 +95,15 @@ ifndef DEPLOYMENTNAMESPACE
 	DEPLOYMENTNAMESPACE := default
 endif
 
-BASEUBIIMAGE ?= registry.access.redhat.com/ubi8/ubi-minimal:8.0
+BASEUBIIMAGE ?= registry.access.redhat.com/ubi8/ubi-minimal:8.4
+
+OPERATORIMAGENAME ?= $(REPONAME)
 
 ifndef OPERATORIMAGE
-	OPERATORIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)
+	OPERATORIMAGE := $(DOCKERNAMESPACE)/$(OPERATORIMAGENAME)$(IMAGESUFFIX)
 endif
 ifndef OPERATORUBIIMAGE
-	OPERATORUBIIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)-ubi
+	OPERATORUBIIMAGE := $(DOCKERNAMESPACE)/$(OPERATORIMAGENAME)$(IMAGESUFFIX)-ubi
 endif
 ifndef ENTERPRISEIMAGE
 	ENTERPRISEIMAGE := $(DEFAULTENTERPRISEIMAGE)
@@ -113,17 +119,23 @@ endif
 
 BINNAME := $(PROJECT)
 BIN := $(BINDIR)/$(BINNAME)
-RELEASE := $(GOBUILDDIR)/bin/release
-GHRELEASE := $(GOBUILDDIR)/bin/github-release
+VBIN := $(BINDIR)/$(RELEASE_MODE)/$(BINNAME)
 
 ifdef VERBOSE
 	TESTVERBOSEOPTIONS := -v
 endif
 
 EXCLUDE_DIRS := tests vendor .gobuild deps tools
-SOURCES_QUERY := find $(SRCDIR) -name '*.go' -type f -not -path '$(SRCDIR)/tests/*' -not -path '$(SRCDIR)/vendor/*' -not -path '$(SRCDIR)/.gobuild/*' -not -path '$(SRCDIR)/deps/*' -not -path '$(SRCDIR)/tools/*'
+SOURCES_QUERY := find ./ -type f -name '*.go' $(foreach EXCLUDE_DIR,$(EXCLUDE_DIRS), ! -path "./$(EXCLUDE_DIR)/*")
 SOURCES := $(shell $(SOURCES_QUERY))
-DASHBOARDSOURCES := $(shell find $(DASHBOARDDIR)/src -name '*.js' -not -path './test/*') $(DASHBOARDDIR)/package.json
+DASHBOARDSOURCES := $(shell find $(DASHBOARDDIR)/src -name '*.js') $(DASHBOARDDIR)/package.json
+LINT_EXCLUDES:=
+ifeq ($(RELEASE_MODE),enterprise)
+LINT_EXCLUDES+=.*\.community\.go$$
+else
+LINT_EXCLUDES+=.*\.enterprise\.go$$
+endif
+
 
 .DEFAULT_GOAL := all
 .PHONY: all
@@ -166,9 +178,11 @@ fmt-verify: license-verify
 
 .PHONY: linter
 linter:
-	$(GOPATH)/bin/golangci-lint run --no-config --issues-exit-code=1 --deadline=30m --exclude-use-default=false \
+	$(GOPATH)/bin/golangci-lint run --build-tags "$(RELEASE_MODE)" --no-config --issues-exit-code=1 --deadline=30m --exclude-use-default=false \
 	--disable-all $(foreach EXCLUDE_DIR,$(EXCLUDE_DIRS),--skip-dirs $(EXCLUDE_DIR)) \
-	$(foreach MODE,$(GOLANGCI_ENABLED),--enable $(MODE)) ./...
+	$(foreach MODE,$(GOLANGCI_ENABLED),--enable $(MODE)) \
+	$(foreach LINT_EXCLUDE,$(LINT_EXCLUDES),--exclude '$(LINT_EXCLUDE)') \
+	./...
 
 .PHONY: build
 build: docker manifests
@@ -220,7 +234,7 @@ update-generated:
 verify-generated:
 	@${MAKE} -B -s VERIFYARGS=--verify-only update-generated
 
-dashboard/assets.go: $(DASHBOARDSOURCES) $(DASHBOARDDIR)/Dockerfile.build
+dashboard/assets.go:
 	cd $(DASHBOARDDIR) && docker build -t $(DASHBOARDBUILDIMAGE) -f Dockerfile.build $(DASHBOARDDIR)
 	@mkdir -p $(DASHBOARDDIR)/build
 	docker run --rm \
@@ -234,9 +248,12 @@ dashboard/assets.go: $(DASHBOARDSOURCES) $(DASHBOARDDIR)/Dockerfile.build
 .PHONY: bin
 bin: $(BIN)
 
-$(BIN): $(SOURCES) dashboard/assets.go VERSION
-	@mkdir -p $(BINDIR)
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -installsuffix netgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o $(BIN) $(REPOPATH)
+$(VBIN): $(SOURCES) dashboard/assets.go VERSION
+	@mkdir -p $(VBINDIR)
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build --tags "$(RELEASE_MODE)" -installsuffix netgo -ldflags "-X $(REPOPATH)/pkg/version.version=$(VERSION) -X $(REPOPATH)/pkg/version.buildDate=$(BUILDTIME) -X $(REPOPATH)/pkg/version.build=$(COMMIT)" -o $(VBIN) $(REPOPATH)
+
+$(BIN): $(VBIN)
+	@cp "$(VBIN)" "$(BIN)"
 
 .PHONY: docker
 docker: check-vars $(BIN)
@@ -331,7 +348,7 @@ manifests: chart-operator
 
 .PHONY: run-unit-tests
 run-unit-tests: $(SOURCES)
-	go test --count=1 $(TESTVERBOSEOPTIONS) \
+	go test --count=1 --tags "$(RELEASE_MODE)" $(TESTVERBOSEOPTIONS) \
 		$(REPOPATH)/pkg/apis/backup/... \
 		$(REPOPATH)/pkg/apis/deployment/... \
 		$(REPOPATH)/pkg/apis/replication/... \
@@ -361,45 +378,6 @@ patch-release: patch-readme patch-examples
 patch-chart:
 	$(ROOTDIR)/scripts/patch_chart.sh "$(VERSION_MAJOR_MINOR_PATCH)" "$(OPERATORIMAGE)"
 
-.PHONY: docker-push
-docker-push: docker
-ifneq ($(DOCKERNAMESPACE), arangodb)
-	docker tag $(OPERATORIMAGE) $(DOCKERNAMESPACE)/arangodb-operator
-endif
-	docker push $(DOCKERNAMESPACE)/arangodb-operator
-
-.PHONY: docker-push-version
-docker-push-version: docker
-	docker tag arangodb/arangodb-operator arangodb/arangodb-operator:$(VERSION)
-	docker tag arangodb/arangodb-operator arangodb/arangodb-operator:$(VERSION_MAJOR_MINOR)
-	docker tag arangodb/arangodb-operator arangodb/arangodb-operator:$(VERSION_MAJOR)
-	docker tag arangodb/arangodb-operator arangodb/arangodb-operator:latest
-	docker push arangodb/arangodb-operator:$(VERSION)
-	docker push arangodb/arangodb-operator:$(VERSION_MAJOR_MINOR)
-	docker push arangodb/arangodb-operator:$(VERSION_MAJOR)
-	docker push arangodb/arangodb-operator:latest
-
-$(RELEASE): $(GOBUILDDIR) $(SOURCES) $(GHRELEASE)
-	GOPATH=$(GOBUILDDIR) go build -o $(RELEASE) $(REPOPATH)/tools/release
-
-.PHONY: build-ghrelease
-build-ghrelease: $(GHRELEASE)
-
-$(GHRELEASE): $(GOBUILDDIR)
-	GOPATH=$(GOBUILDDIR) go build -o $(GHRELEASE) github.com/aktau/github-release
-
-.PHONY: release-patch
-release-patch: $(RELEASE)
-	GOPATH=$(GOBUILDDIR) $(RELEASE) -type=patch
-
-.PHONY: release-minor
-release-minor: $(RELEASE)
-	GOPATH=$(GOBUILDDIR) $(RELEASE) -type=minor
-
-.PHONY: release-major
-release-major: $(RELEASE)
-	GOPATH=$(GOBUILDDIR) $(RELEASE) -type=major
-
 .PHONY: tidy
 tidy:
 	@go mod tidy
@@ -408,7 +386,7 @@ tidy:
 deps-reload: tidy init
 
 .PHONY: init
-init: tools update-generated $(GHRELEASE) $(RELEASE) $(BIN) vendor
+init: tools update-generated $(BIN) vendor
 
 .PHONY: tools
 tools: update-vendor