Skip to content

Commit 763c9c4

Browse files
polefishupolefishu
committed
update github.com/operator-framework/operator-sdk to v0.13.0 to fixed leader election bug: Delete evicted leader pods
1 parent 3cbe9d2 commit 763c9c4

File tree

1,496 files changed

+164952
-178147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,496 files changed

+164952
-178147
lines changed

‎Dockerfile‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
FROM golang:1.11.5-alpine3.7 as go-builder
1+
FROM golang:1.13.3-alpine as go-builder
2+
3+
RUN apk update && apk upgrade && \
4+
apk add --no-cache ca-certificates git mercurial
25

36
ARG PROJECT_NAME=redis-operator
47
ARG REPO_PATH=github.com/ucloud/$PROJECT_NAME
@@ -8,21 +11,21 @@ ARG BUILD_PATH=${REPO_PATH}/cmd/manager
811
ARG VERSION=0.1.1
912
ARG GIT_SHA=0000000
1013

11-
RUN mkdir -p /go/src/${REPO_PATH}/vendor
14+
WORKDIR /src
15+
16+
COPY go.mod ./ go.sum ./
17+
RUN GOPROXY=https://goproxy.cn,direct go mod download
1218

13-
COPY pkg /go/src/${REPO_PATH}/pkg
14-
COPY cmd /go/src/${REPO_PATH}/cmd
15-
COPY vendor /go/src/${REPO_PATH}/vendor
19+
COPY pkg ./ cmd ./ version ./
1620

1721
RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o ${GOBIN}/${PROJECT_NAME} \
1822
-ldflags "-X ${REPO_PATH}/pkg/version.Version=${VERSION} -X ${REPO_PATH}/pkg/version.GitSHA=${GIT_SHA}" \
1923
$BUILD_PATH
2024

2125
# =============================================================================
22-
FROM alpine:3.7 AS final
26+
FROM alpine:3.9 AS final
2327

2428
ARG PROJECT_NAME=redis-operator
25-
ARG REPO_PATH=github.com/ucloud/$PROJECT_NAME
2629

2730
COPY --from=go-builder ${GOBIN}/${PROJECT_NAME} /usr/local/bin/${PROJECT_NAME}
2831

‎Dockerfile-withvendor‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
FROM golang:1.13.3-alpine as go-builder
2+
3+
ARG PROJECT_NAME=redis-operator
4+
ARG REPO_PATH=github.com/ucloud/$PROJECT_NAME
5+
ARG BUILD_PATH=${REPO_PATH}/cmd/manager
6+
7+
# Build version and commit should be passed in when performing docker build
8+
ARG VERSION=0.1.1
9+
ARG GIT_SHA=0000000
10+
11+
RUN mkdir -p /go/src/${REPO_PATH}/vendor
12+
13+
COPY pkg /go/src/${REPO_PATH}/pkg
14+
COPY cmd /go/src/${REPO_PATH}/cmd
15+
COPY vendor /go/src/${REPO_PATH}/vendor
16+
17+
RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o ${GOBIN}/${PROJECT_NAME} \
18+
-ldflags "-X ${REPO_PATH}/pkg/version.Version=${VERSION} -X ${REPO_PATH}/pkg/version.GitSHA=${GIT_SHA}" \
19+
$BUILD_PATH
20+
21+
# =============================================================================
22+
FROM alpine:3.9 AS final
23+
24+
ARG PROJECT_NAME=redis-operator
25+
ARG REPO_PATH=github.com/ucloud/$PROJECT_NAME
26+
27+
COPY --from=go-builder ${GOBIN}/${PROJECT_NAME} /usr/local/bin/${PROJECT_NAME}
28+
29+
RUN adduser -D ${PROJECT_NAME}
30+
USER ${PROJECT_NAME}
31+
32+
ENTRYPOINT ["/usr/local/bin/redis-operator"]

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ E2EALTREPO=$(REGISTRY)/$(PROJECT_NAME)-e2e
1010
VERSION=$(shell git describe --always --tags --dirty | sed "s/\(.*\)-g`git rev-parse --short HEAD`/\1/")
1111
GIT_SHA=$(shell git rev-parse --short HEAD)
1212
BIN_DIR=build/bin
13-
.PHONY: all build check clean test login
13+
.PHONY: all build check clean test login build-e2e push-e2e
1414

1515
all: check build
1616

@@ -28,6 +28,7 @@ build-image:
2828
docker build --build-arg VERSION=$(VERSION) --build-arg GIT_SHA=$(GIT_SHA) -t $(ALTREPO):$(VERSION) .
2929
docker tag $(ALTREPO):$(VERSION) $(ALTREPO):latest
3030

31+
build-e2e:
3132
docker build -t $(E2EALTREPO):$(VERSION) -f test/e2e/Dockerfile .
3233

3334
test:
@@ -40,6 +41,7 @@ push: build-image
4041
docker push $(ALTREPO):$(VERSION)
4142
docker push $(ALTREPO):latest
4243

44+
push-e2e: build-e2e
4345
docker push $(E2EALTREPO):$(VERSION)
4446

4547
clean:

‎go.mod‎

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,41 @@ module github.com/ucloud/redis-operator
33
require (
44
github.com/go-logr/logr v0.1.0
55
github.com/go-redis/redis v6.15.2+incompatible
6-
github.com/onsi/ginkgo v1.7.0
7-
github.com/onsi/gomega v1.4.3
8-
github.com/operator-framework/operator-sdk v0.8.1-0.20190711220207-283ac6f58bec
9-
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
10-
github.com/spf13/pflag v1.0.3
11-
github.com/stretchr/testify v1.3.0
12-
k8s.io/api v0.0.0-20190612125737-db0771252981
13-
k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
14-
k8s.io/client-go v11.0.0+incompatible
15-
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
16-
sigs.k8s.io/controller-runtime v0.1.12
17-
sigs.k8s.io/controller-tools v0.1.10
6+
github.com/onsi/ginkgo v1.8.0
7+
github.com/onsi/gomega v1.5.0
8+
github.com/operator-framework/operator-sdk v0.13.0
9+
github.com/prometheus/client_golang v1.1.0
10+
github.com/spf13/pflag v1.0.5
11+
github.com/stretchr/testify v1.4.0
12+
k8s.io/api v0.0.0
13+
k8s.io/apimachinery v0.0.0
14+
k8s.io/client-go v12.0.0+incompatible
15+
sigs.k8s.io/controller-runtime v0.4.0
1816
)
1917

20-
// Pinned to kubernetes-1.13.4
18+
// Pinned to kubernetes-1.16.2
2119
replace (
22-
k8s.io/api => k8s.io/api v0.0.0-20190222213804-5cb15d344471
23-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190228180357-d002e88f6236
24-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
25-
k8s.io/client-go => k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4
26-
)
27-
28-
replace (
29-
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
30-
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.6.0
31-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.12
32-
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
20+
k8s.io/api => k8s.io/api v0.0.0-20191016110408-35e52d86657a
21+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65
22+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
23+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191016112112-5190913f932d
24+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5
25+
k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
26+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191016115326-20453efc2458
27+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191016115129-c07a134afb42
28+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
29+
k8s.io/component-base => k8s.io/component-base v0.0.0-20191016111319-039242c015a9
30+
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
31+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191016115521-756ffa5af0bd
32+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191016112429-9587704a8ad4
33+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191016114939-2b2b218dc1df
34+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191016114407-2e83b6f20229
35+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191016114748-65049c67a58b
36+
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51
37+
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191016114556-7841ed97f1b2
38+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191016115753-cf0698c3a16b
39+
k8s.io/metrics => k8s.io/metrics v0.0.0-20191016113814-3b1a734dba6e
40+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191016112829-06bb3c9d77c9
3341
)
3442

3543
go 1.13

0 commit comments

Comments
 (0)