Skip to content

Commit

Permalink
Update go.mod with no replace directives & k8s ver
Browse files Browse the repository at this point in the history
The replace blocks should only be used temporarily unless an imported
package forces them on. To make zookeeper more importable by other
packages, don't use any replace directives that will require the parent
package to also set them.

Update Kubernetes version to 1.23.1 and controller runtime to 0.11.0.

Signed-off-by: Tudor Marcu <[email protected]>
  • Loading branch information
tmarcu committed Apr 8, 2022
1 parent 8c4ff1e commit 2cdf652
Show file tree
Hide file tree
Showing 12 changed files with 1,122 additions and 501 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
release:
types:
- created

# jobs to run
jobs:
build:
Expand All @@ -23,8 +23,14 @@ jobs:
with:
go-version: 1.17
id: go
- name: Set up Go for root
run: |
sudo ln -sf `which go` `sudo which go` || true
sudo go version
- name: Check out code into the Go module directory
uses: actions/checkout@v2
- name: get go version
run: go version
- name: Gofmt and License checks
run: make check
- name: unit tests
Expand All @@ -33,7 +39,7 @@ jobs:
uses: codecov/[email protected]
- name: Set env
run: |
echo "KUBERNETES_VERSION=v1.20.13" >> $GITHUB_ENV
echo "KUBERNETES_VERSION=v1.23.1" >> $GITHUB_ENV
echo "OPERATOR_SDK_VERSION=v0.19.4" >> $GITHUB_ENV
echo "MINIKUBE_VERSION=v1.24.0" >> $GITHUB_ENV
echo "KUBERNETES_CONFIG_FILE=$HOME/.kube/config" >> $GITHUB_ENV
Expand Down
58 changes: 0 additions & 58 deletions .travis.yml

This file was deleted.

7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ ifeq (, $(shell which controller-gen))
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
cd $$CONTROLLER_GEN_TMP_DIR ;\
go mod init tmp ;\
go get sigs.k8s.io/controller-tools/cmd/[email protected] ;\
go install sigs.k8s.io/controller-tools/cmd/[email protected] ;\
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
}
CONTROLLER_GEN=$(GOBIN)/controller-gen
Expand All @@ -102,7 +102,7 @@ ifeq (, $(shell which kustomize))
KUSTOMIZE_GEN_TMP_DIR=$$(mktemp -d) ;\
cd $$KUSTOMIZE_GEN_TMP_DIR ;\
go mod init tmp ;\
go get sigs.k8s.io/kustomize/kustomize/[email protected] ;\
go install sigs.k8s.io/kustomize/kustomize/[email protected] ;\
rm -rf $$KUSTOMIZE_GEN_TMP_DIR ;\
}
KUSTOMIZE=$(GOBIN)/kustomize
Expand Down Expand Up @@ -208,6 +208,3 @@ check-format:

check-license:
./scripts/check_license.sh

update-kube-version:
./scripts/update_kube_version.sh ${KUBE_VERSION}
Loading

0 comments on commit 2cdf652

Please sign in to comment.