-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #47 from cybertec-postgresql/v0.7.0-dev
Merge whole release into main
- Loading branch information
Showing
186 changed files
with
4,388 additions
and
2,805 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ on: | |
| pull_request: | ||
| push: | ||
| branches: | ||
| - master | ||
| - main | ||
|
|
||
| jobs: | ||
| tests: | ||
|
|
@@ -14,15 +14,15 @@ jobs: | |
| - uses: actions/checkout@v2 | ||
| - uses: actions/setup-go@v2 | ||
| with: | ||
| go-version: "^1.19.8" | ||
| go-version: "^1.21.7" | ||
| - name: Make dependencies | ||
| run: make deps mocks | ||
| - name: Compile | ||
| run: make linux | ||
| - name: Run unit tests | ||
| run: go test -race -covermode atomic -coverprofile=coverage.out ./... | ||
| - name: Convert coverage to lcov | ||
| uses: jandelgado/[email protected].8 | ||
| uses: jandelgado/[email protected].9 | ||
| - name: Coveralls | ||
| uses: coverallsapp/github-action@master | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| .PHONY: clean local test linux macos mocks docker push e2e | ||
|
|
||
| BINARY ?= postgres-operator | ||
| BINARY ?= cybertec-pg-operator | ||
| BUILD_FLAGS ?= -v | ||
| CGO_ENABLED ?= 0 | ||
| ifeq ($(RACE),1) | ||
|
|
@@ -12,7 +12,7 @@ LOCAL_BUILD_FLAGS ?= $(BUILD_FLAGS) | |
| LDFLAGS ?= -X=main.version=$(VERSION) | ||
| DOCKERDIR = docker | ||
|
|
||
| IMAGE ?= registry.opensource.zalan.do/acid/$(BINARY) | ||
| IMAGE ?= docker.io/cybertecpostgresql/$(BINARY) | ||
| TAG ?= $(VERSION) | ||
| GITHEAD = $(shell git rev-parse --short HEAD) | ||
| GITURL = $(shell git config --get remote.origin.url) | ||
|
|
@@ -22,6 +22,17 @@ VERSION ?= $(shell git describe --tags --always --dirty) | |
| DIRS := cmd pkg | ||
| PKG := `go list ./... | grep -v /vendor/` | ||
|
|
||
| BASE_IMAGE ?= rockylinux:9 | ||
| PACKAGER ?= dnf | ||
| BUILD ?= 1 | ||
| ROOTPATH = $(GOPATH)/src/github.com/cybertec/cybertec-pg-operator | ||
| VERIFY_CODEGEN ?= 1 | ||
| ifndef ROOTPATH | ||
| export ROOTPATH=$(GOPATH)/src/github.com/cybertec/cybertec-pg-operator | ||
| endif | ||
|
|
||
| ALL_SOURCES = $(shell find pkg/ -name '*.go') | ||
|
|
||
| ifeq ($(DEBUG),1) | ||
| DOCKERFILE = DebugDockerfile | ||
| DEBUG_POSTFIX := -debug-$(shell date hhmmss) | ||
|
|
@@ -50,27 +61,34 @@ default: local | |
| clean: | ||
| rm -rf build | ||
|
|
||
| local: ${SOURCES} | ||
| hack/verify-codegen.sh | ||
| CGO_ENABLED=${CGO_ENABLED} go build -o build/${BINARY} $(LOCAL_BUILD_FLAGS) -ldflags "$(LDFLAGS)" $^ | ||
| local: build/cybertec-pg-operator | ||
|
|
||
| build/cybertec-pg-operator: ${SOURCES} ${ALL_SOURCES} | ||
| if [ "$(VERIFY_CODEGEN)" = "1" ]; then hack/verify-codegen.sh; fi | ||
| CGO_ENABLED=${CGO_ENABLED} go build -o build/${BINARY} $(LOCAL_BUILD_FLAGS) -ldflags "$(LDFLAGS)" $< | ||
|
|
||
| linux: ${SOURCES} | ||
| GOOS=linux GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -o build/linux/${BINARY} ${BUILD_FLAGS} -ldflags "$(LDFLAGS)" $^ | ||
|
|
||
| macos: ${SOURCES} | ||
| GOOS=darwin GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -o build/macos/${BINARY} ${BUILD_FLAGS} -ldflags "$(LDFLAGS)" $^ | ||
|
|
||
| docker: ${DOCKERDIR}/${DOCKERFILE} | ||
| docker: ${DOCKERDIR}/${DOCKERFILE} | ||
|
|
||
| docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)" -f "${DOCKERDIR}/${DOCKERFILE}" --build-arg VERSION="${VERSION}" --build-arg BASE_IMAGE="${BASE_IMAGE}" --build-arg PACKAGER="${PACKAGER}" . | ||
|
|
||
| # docker build --rm --build-arg VERSION="${VERSION}" . | ||
|
|
||
| # docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)" -f "${DOCKERDIR}/${DOCKERFILE}" --build-arg VERSION="${VERSION}" . | ||
|
|
||
| # ${VERSION} | ||
|
|
||
| docker-local: build/cybertec-pg-operator | ||
| docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)" -f "${DOCKERDIR}/Dockerfile-dev" --build-arg VERSION="${VERSION}" --build-arg BASE_IMAGE="${BASE_IMAGE}" --build-arg PACKAGER="${PACKAGER}" . | ||
|
|
||
| echo `(env)` | ||
| echo "Tag ${TAG}" | ||
| echo "Version ${VERSION}" | ||
| echo "CDP tag ${CDP_TAG}" | ||
| echo "git describe $(shell git describe --tags --always --dirty)" | ||
| docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)" -f "${DOCKERDIR}/${DOCKERFILE}" --build-arg VERSION="${VERSION}" . | ||
|
|
||
| indocker-race: | ||
| docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.19.8 bash -c "make linux" | ||
| docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.21.7 bash -c "make linux" | ||
|
|
||
| push: | ||
| docker push "$(IMAGE):$(TAG)$(CDP_TAG)" | ||
|
|
@@ -79,7 +97,7 @@ mocks: | |
| GO111MODULE=on go generate ./... | ||
|
|
||
| tools: | ||
| GO111MODULE=on go get -d k8s.io/client-go@kubernetes-1.25.9 | ||
| GO111MODULE=on go get -d k8s.io/client-go@kubernetes-1.28.7 | ||
| GO111MODULE=on go install github.com/golang/mock/[email protected] | ||
| GO111MODULE=on go mod tidy | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ apiVersion: v2 | |
| name: postgres-operator-ui | ||
| version: 1.10.1 | ||
| appVersion: 1.10.1 | ||
| home: https://github.com/zalando/postgres-operator | ||
| home: https://github.com/cybertec-postgresql/cybertec-pg-operator | ||
| description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience | ||
| keywords: | ||
| - postgres | ||
|
|
@@ -15,5 +15,5 @@ maintainers: | |
| - name: Zalando | ||
| email: [email protected] | ||
| sources: | ||
| - https://github.com/zalando/postgres-operator | ||
| - https://github.com/cybertec-postgresql/cybertec-pg-operator | ||
| engine: gotpl | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.