REVERT/to_0.4.0 (#476)

Author: ajanikow

.dockerignore

@@ -2,5 +2,7 @@
 .git
 .gobuild
 docs
+pkg
 tools
 deps
+dashboard

Dockerfile

@@ -1,42 +1,5 @@
-# Upgrading to golang:1.13-alpine:
-# It is possible once prometheus-operator will release new version (newer then 0.33.0)
+FROM scratch 
 
-# Download packages required by kube-arangodb
-FROM golang:1.12.9-alpine AS downloader
+ADD bin/arangodb_operator /usr/bin/
 
-# git is required by 'go mod'
-RUN apk add git
-
-WORKDIR /app
-
-COPY go.mod .
-COPY go.sum .
-# It is done only once unless go.mod has been changed
-RUN go mod download
-
-
-
-# Compile Golang kube-arangodb sources with downloaded dependencies
-FROM downloader AS builder
-ARG VERSION
-ARG COMMIT
-
-COPY *.go /app/
-COPY pkg /app/pkg
-COPY dashboard/assets.go /app/dashboard/assets.go
-
-ENV GO111MODULE=on
-ENV CGO_ENABLED=0
-ENV GOARCH=amd64
-ENV GOOS=linux
-
-RUN go build -installsuffix netgo -ldflags "-X main.projectVersion=${VERSION} -X main.projectBuild=${COMMIT}" -o /arangodb_operator
-
-
-
-# Build the final production image with only binary file
-FROM scratch
-
-COPY --from=builder /arangodb_operator /usr/bin/arangodb_operator
-
-ENTRYPOINT [ "/usr/bin/arangodb_operator" ]
+ENTRYPOINT [ "/usr/bin/arangodb_operator" ]

Dockerfile.test

@@ -0,0 +1,5 @@
+FROM scratch 
+
+ADD bin/arangodb_operator_test /usr/bin/
+
+ENTRYPOINT [ "/usr/bin/arangodb_operator_test" ]

Dockerfile.unittest

@@ -6,6 +6,7 @@ VERSION_MAJOR_MINOR_PATCH := $(shell echo $(VERSION) | cut -f 1 -d '+')
 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)
 
 GOBUILDDIR := $(SCRIPTDIR)/.gobuild
 SRCDIR := $(SCRIPTDIR)
@@ -17,13 +18,19 @@ DASHBOARDDIR := $(ROOTDIR)/dashboard
 ORGPATH := github.com/arangodb
 ORGDIR := $(GOBUILDDIR)/src/$(ORGPATH)
 REPONAME := kube-arangodb
+REPODIR := $(ORGDIR)/$(REPONAME)
 REPOPATH := $(ORGPATH)/$(REPONAME)
 
 GOPATH := $(GOBUILDDIR)
+GOVERSION := 1.10.0-alpine
 
 PULSAR := $(GOBUILDDIR)/bin/pulsar$(shell go env GOEXE)
 GOASSETSBUILDER := $(GOBUILDDIR)/bin/go-assets-builder$(shell go env GOEXE)
 
+DOCKERFILE := Dockerfile
+DOCKERTESTFILE := Dockerfile.test
+DOCKERDURATIONTESTFILE := tests/duration/Dockerfile
+
 HELM ?= $(shell which helm)
 
 .PHONY: helm
@@ -92,6 +99,10 @@ ifndef ALLOWCHAOS
 	ALLOWCHAOS := true
 endif
 
+BINNAME := $(PROJECT)
+BIN := $(BINDIR)/$(BINNAME)
+TESTBINNAME := $(PROJECT)_test
+TESTBIN := $(BINDIR)/$(TESTBINNAME)
 DURATIONTESTBINNAME := $(PROJECT)_duration_test
 DURATIONTESTBIN := $(BINDIR)/$(DURATIONTESTBINNAME)
 RELEASE := $(GOBUILDDIR)/bin/release
@@ -103,6 +114,9 @@ ifeq ($(LONG), 1)
 	TESTLENGTHOPTIONS :=
 	TESTTIMEOUT := 300m
 endif
+ifdef VERBOSE
+	TESTVERBOSEOPTIONS := -v
+endif
 
 SOURCES := $(shell find $(SRCDIR) -name '*.go' -not -path './test/*')
 DASHBOARDSOURCES := $(shell find $(DASHBOARDDIR)/src -name '*.js' -not -path './test/*') $(DASHBOARDDIR)/package.json
@@ -151,7 +165,7 @@ build: docker manifests
 
 .PHONY: clean
 clean:
-	rm -Rf $(BINDIR) $(DASHBOARDDIR)/build $(DASHBOARDDIR)/node_modules
+	rm -Rf $(BIN) $(BINDIR) $(DASHBOARDDIR)/build $(DASHBOARDDIR)/node_modules
 
 .PHONY: check-vars
 check-vars:
@@ -196,9 +210,13 @@ dashboard/assets.go: $(DASHBOARDSOURCES) $(DASHBOARDDIR)/Dockerfile.build
 		$(DASHBOARDBUILDIMAGE)
 	go run github.com/jessevdk/go-assets-builder -s /dashboard/build/ -o dashboard/assets.go -p dashboard dashboard/build
 
+$(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)
+
 .PHONY: docker
-docker: check-vars $(SOURCES) dashboard/assets.go VERSION
-	docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT=$(COMMIT) -f Dockerfile -t $(OPERATORIMAGE) .
+docker: check-vars $(BIN)
+	docker build -f $(DOCKERFILE) -t $(OPERATORIMAGE) .
 ifdef PUSHIMAGES
 	docker push $(OPERATORIMAGE)
 endif
@@ -285,16 +303,28 @@ manifests: helm manifests-crd manifests-operator manifests-test chart-crd chart-
 
 .PHONY: run-unit-tests
 run-unit-tests: $(SOURCES)
-ifdef VERBOSE
-	docker build --build-arg VERBOSE=-v -f Dockerfile.unittest .
-else
-	docker build -f Dockerfile.unittest .
-endif
+	go test $(TESTVERBOSEOPTIONS) \
+		$(REPOPATH)/pkg/apis/backup/v1alpha \
+		$(REPOPATH)/pkg/apis/deployment/v1alpha \
+		$(REPOPATH)/pkg/apis/replication/v1alpha \
+		$(REPOPATH)/pkg/apis/storage/v1alpha \
+		$(REPOPATH)/pkg/deployment/reconcile \
+		$(REPOPATH)/pkg/deployment/resources \
+		$(REPOPATH)/pkg/storage \
+		$(REPOPATH)/pkg/util/k8sutil \
+		$(REPOPATH)/pkg/util/k8sutil/test \
+		$(REPOPATH)/pkg/util/probe \
+		$(REPOPATH)/pkg/util/validation \
+		$(REPOPATH)/pkg/backup/...
+
+$(TESTBIN): $(GOBUILDDIR) $(SOURCES)
+	@mkdir -p $(BINDIR)
+	CGO_ENABLED=0 go test -c -installsuffix netgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o $(TESTBIN) $(REPOPATH)/tests
 
 
 .PHONY: docker-test
-docker-test: check-vars $(GOBUILDDIR) $(SOURCES)
-	docker build --quiet -f tests/Dockerfile -t $(TESTIMAGE) .
+docker-test: $(TESTBIN)
+	docker build --quiet -f $(DOCKERTESTFILE) -t $(TESTIMAGE) .
 
 .PHONY: run-upgrade-tests
 run-upgrade-tests:
@@ -346,7 +376,7 @@ $(DURATIONTESTBIN): $(SOURCES)
 
 .PHONY: docker-duration-test
 docker-duration-test: $(DURATIONTESTBIN)
-	docker build --quiet -f tests/duration/Dockerfile -t $(DURATIONTESTIMAGE) .
+	docker build --quiet -f $(DOCKERDURATIONTESTFILE) -t $(DURATIONTESTIMAGE) .
 ifdef PUSHIMAGES
 	docker push $(DURATIONTESTIMAGE)
 endif

Makefile

@@ -65,15 +65,6 @@ Feature-wise production readiness table:
 | Volume Claim Templates       | 0.3.11                                | new - alpha               |                   |
 | Prometheus Metrics export    | 0.3.11                                | new - alpha               | needs Prometheus  |
 | User sidecar containers      | 0.3.11                                | new - alpha               |                   |
-| Support for ResignLeadership | 0.3.16                                | new - alpha               |                   |
-| Hot backup                   | 0.4.0                                 | new - alpha               | needs ArangoDB    |
-|                              |                                       |                           | >= 3.5.1          |
-
-## Release notes for 0.4.0
-
-In this release we have amended the Helm charts again. The same comments
-as for 0.3.16 apply. Furthermore, 0.4.0 is the first version to support
-hot backups.
 
 ## Release notes for 0.3.16
 
@@ -109,12 +100,12 @@ upgrades.
 
 ```bash
 # The following will install the custom resources required by the operators.
-helm install https://github.com/arangodb/kube-arangodb/releases/download/0.4.0/kube-arangodb-crd-0.4.0.tgz
+helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.16/kube-arangodb-crd-0.3.16.tgz
 # The following will install the operator for `ArangoDeployment` &
 # `ArangoDeploymentReplication` resources.
-helm install https://github.com/arangodb/kube-arangodb/releases/download/0.4.0/kube-arangodb-0.4.0.tgz
+helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.16/kube-arangodb-0.3.16.tgz
 # To use `ArangoLocalStorage`, set field `operator.features.storage` to true
-helm install https://github.com/arangodb/kube-arangodb/releases/download/0.4.0/kube-arangodb-0.4.0.tgz --set "operator.features.storage=true"
+helm install https://github.com/arangodb/kube-arangodb/releases/download/0.3.16/kube-arangodb-0.3.16.tgz --set "operator.features.storage=true"
 ```
 
 ## Upgrading the operator using Helm

README.md

@@ -1 +1 @@
-0.4.0+git
+0.4.0

VERSION

@@ -13,9 +13,6 @@ metadata:
         app.kubernetes.io/instance: {{ .Release.Name }}
         release: {{ .Release.Name }}
 rules:
-    - apiGroups: [""]
-      resources: ["persistentvolumes", "persistentvolumeclaims", "endpoints", "events", "services"]
-      verbs: ["*"]
     - apiGroups: ["apiextensions.k8s.io"]
       resources: ["customresourcedefinitions"]
       verbs: ["get"]

chart/kube-arangodb/templates/storage-operator/cluster-role.yaml

@@ -13,6 +13,9 @@ metadata:
         app.kubernetes.io/instance: {{ .Release.Name }}
         release: {{ .Release.Name }}
 rules:
+    - apiGroups: [""]
+      resources: ["persistentvolumes", "persistentvolumeclaims", "endpoints", "events", "services"]
+      verbs: ["*"]
     - apiGroups: [""]
       resources: ["pods"]
       verbs: ["get", "update"]

chart/kube-arangodb/templates/storage-operator/role.yaml

@@ -8,47 +8,94 @@ replace (
 	k8s.io/api => k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
+	k8s.io/code-generator => ./deps/k8s.io/code-generator
+
 )
 
 require (
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
+	github.com/Azure/go-autorest/autorest v0.1.0 // indirect
+	github.com/aktau/github-release v0.7.2 // indirect
 	github.com/arangodb-helper/go-certificates v0.0.0-20180821055445-9fca24fc2680
 	github.com/arangodb/arangosync-client v0.6.3
 	github.com/arangodb/go-driver v0.0.0-20191002124627-11b6bfc64f67
 	github.com/arangodb/go-upgrade-rules v0.0.0-20180809110947-031b4774ff21
+	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
+	github.com/bugagazavr/go-gitlab-client v0.0.0-20150830002541-e5999f934dc4 // indirect
 	github.com/cenkalti/backoff v2.1.1+incompatible
+	github.com/coreos/bbolt v1.3.2 // indirect
+	github.com/coreos/etcd v3.3.13+incompatible // indirect
 	github.com/coreos/go-semver v0.3.0
+	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/coreos/prometheus-operator v0.31.1
+	github.com/cpuguy83/go-md2man v1.0.10 // indirect
 	github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
+	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 // indirect
+	github.com/dustin/go-broadcast v0.0.0-20171205050544-f664265f5a66 // indirect
 	github.com/evanphx/json-patch v4.2.0+incompatible
+	github.com/ewoutp/go-gitlab-client v0.0.0-20150214183219-6e4464cd3221 // indirect
 	github.com/ghodss/yaml v1.0.0
 	github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 // indirect
+	github.com/gin-gonic/autotls v0.0.0-20190406003154-fb31fc47f521 // indirect
 	github.com/gin-gonic/gin v1.3.0
-	github.com/go-openapi/spec v0.18.0 // indirect
-	github.com/go-openapi/swag v0.18.0 // indirect
+	github.com/go-openapi/analysis v0.19.0 // indirect
+	github.com/go-openapi/errors v0.19.0 // indirect
+	github.com/go-openapi/loads v0.19.0 // indirect
+	github.com/go-openapi/runtime v0.19.0 // indirect
+	github.com/go-openapi/strfmt v0.19.0 // indirect
 	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
+	github.com/google/btree v1.0.0 // indirect
 	github.com/google/gofuzz v1.0.0 // indirect
-	github.com/google/uuid v1.1.1 // indirect
 	github.com/googleapis/gnostic v0.2.0 // indirect
+	github.com/gophercloud/gophercloud v0.0.0-20190504011306-6f9faf57fddc // indirect
+	github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 // indirect
+	github.com/gorilla/websocket v1.4.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
+	github.com/helm/helm v2.14.3+incompatible // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jessevdk/go-assets v0.0.0-20160921144138-4f4301a06e15
+	github.com/jessevdk/go-assets-builder v0.0.0-20130903091706-b8483521738f // indirect
+	github.com/jessevdk/go-flags v1.4.0 // indirect
+	github.com/jonboulle/clockwork v0.1.0 // indirect
+	github.com/juju/errgo v0.0.0-20140925100237-08cceb5d0b53 // indirect
 	github.com/julienschmidt/httprouter v1.2.0
-	github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe // indirect
+	github.com/manucorporat/stats v0.0.0-20180402194714-3ba42d56d227 // indirect
+	github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a // indirect
+	github.com/mattn/go-colorable v0.1.1 // indirect
 	github.com/mattn/go-isatty v0.0.7 // indirect
+	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect
 	github.com/pborman/uuid v1.2.0 // indirect
+	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v1.0.0
+	github.com/pulcy/pulsar v0.0.0-20180915062927-71ea24b0ec2f // indirect
 	github.com/robfig/cron v1.2.0
 	github.com/rs/zerolog v1.14.3
+	github.com/russross/blackfriday v2.0.0+incompatible // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/sourcegraph/go-vcsurl v0.0.0-20161114165620-2305ecca26ab // indirect
 	github.com/spf13/cobra v0.0.3
 	github.com/spf13/pflag v1.0.3
+	github.com/spf13/viper v1.3.2 // indirect
 	github.com/stretchr/testify v1.3.0
-	github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2 // indirect
+	github.com/thinkerou/favicon v0.1.0 // indirect
+	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
+	github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect
+	github.com/ugorji/go v1.1.4 // indirect
+	github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 // indirect
+	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
+	go.uber.org/atomic v1.4.0 // indirect
+	go.uber.org/multierr v1.1.0 // indirect
+	go.uber.org/zap v1.10.0 // indirect
 	golang.org/x/sys v0.0.0-20190506115046-ca7f33d4116e
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
-	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
-	gopkg.in/go-playground/validator.v8 v8.18.2 // indirect
+	google.golang.org/api v0.4.0 // indirect
+	google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 // indirect
+	google.golang.org/grpc v1.20.1 // indirect
+	gopkg.in/sourcegraph/go-vcsurl.v1 v1.0.0-20131114132947-6b12603ea6fd // indirect
 	k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
 	k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
 	k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d