Skip to content

Commit

Permalink
chore(deps): bump go modules and k8s libs (#177)
Browse files Browse the repository at this point in the history
* chore(deps): bump go modules and k8s libs
- go bump to v1.19
- k8s libs bump to v0.27.2
- openebs/api/v3 to v3.0.2
- remove vendor directory

Signed-off-by: Niladri Halder <[email protected]>

* chore(deps): update ci go version and installer yamls

Signed-off-by: Niladri Halder <[email protected]>

---------

Signed-off-by: Niladri Halder <[email protected]>
  • Loading branch information
niladrih authored Nov 22, 2023
1 parent 13a62de commit 1cc3661
Show file tree
Hide file tree
Showing 3,377 changed files with 1,809 additions and 1,200,418 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Go 1.16.5
- name: Set up Go 1.19.13
uses: actions/setup-go@v4
with:
go-version: 1.16.5
go-version: 1.19.13

- name: Setup Minikube-Kubernetes
uses: medyagh/setup-minikube@latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Go 1.16.5
- name: Set up Go 1.19.13
uses: actions/setup-go@v4
with:
go-version: 1.16.5
go-version: 1.19.13

- name: Setup Minikube-Kubernetes
uses: medyagh/setup-minikube@latest
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/bin
# IDEs
**/.idea
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.
# list only csi source code directories
#
PACKAGES = $(shell go list ./... | grep -v 'vendor\|pkg/client\|tests')
PACKAGES = $(shell go list ./... | grep -v 'pkg/client\|tests')

# Lint our code. Reference: https://golang.org/cmd/vet/
VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \
Expand All @@ -22,10 +22,10 @@ VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \
# Tools required for different make
# targets or for development purposes
EXTERNAL_TOOLS=\
golang.org/x/tools/cmd/cover@latest \
github.com/axw/gocov/gocov@latest \
github.com/matm/gocov-html/cmd/gocov-html@latest \
github.com/onsi/ginkgo/[email protected]
golang.org/x/tools/cmd/cover@latest \
github.com/axw/gocov/gocov@latest \
github.com/matm/gocov-html/cmd/gocov-html@latest \
github.com/onsi/ginkgo/[email protected]

# The images can be pushed to any docker/image registeries
# like docker hub, quay. The registries are specified in
Expand Down Expand Up @@ -127,7 +127,7 @@ test: format
bootstrap:
@for tool in $(EXTERNAL_TOOLS) ; do \
echo "+ Installing $$tool" ; \
cd && GO111MODULE=on go get $$tool; \
go install $$tool; \
done

.PHONY: csi-driver
Expand All @@ -153,7 +153,7 @@ deploy-images:
.PHONY: license-check
license-check:
@echo "--> Checking license header..."
@licRes=$$(for file in $$(find . -type f -regex '.*\.sh\|.*\.go\|.*Docker.*\|.*\Makefile*' ! -path './vendor/*' ) ; do \
@licRes=$$(for file in $$(find . -type f -regex '.*\.sh\|.*\.go\|.*Docker.*\|.*\Makefile*') ; do \
awk 'NR<=5' $$file | grep -Eq "(Copyright|generated|GENERATED)" || echo $$file; \
done); \
if [ -n "$${licRes}" ]; then \
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/cstor-csi-driver/cstor-csi-driver.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.16.5 as build
FROM golang:1.19.13 as build

ARG BRANCH
ARG RELEASE_TAG
Expand Down
58 changes: 0 additions & 58 deletions buildscripts/install_go.sh

This file was deleted.

2 changes: 1 addition & 1 deletion buildscripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ go build -o $TEMPDIR/maya || exit 1
echo "--> Running tests"
GOBIN="$(which go)"
PATH=$TEMPDIR:$PATH \
$GOBIN test ${GOTEST_FLAGS:--cover -timeout=900s} $($GOBIN list ./... | grep -v 'vendor\|pkg/apis\|pkg/generated\|tests')
$GOBIN test ${GOTEST_FLAGS:--cover -timeout=900s} $($GOBIN list ./... | grep -v 'pkg/apis\|pkg/generated\|tests')

3 changes: 2 additions & 1 deletion buildscripts/update-codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ set -o pipefail
# To support running this script from anywhere, we have to first cd into this directory
# so we can install the tools.
#cd $(dirname "${0}")
cd vendor/k8s.io/code-generator/
go get k8s.io/[email protected]
cd "$(go env GOPATH)/pkg/mod/k8s.io/[email protected]"
go install ./cmd/{defaulter-gen,client-gen,lister-gen,informer-gen,deepcopy-gen,conversion-gen,defaulter-gen}
)

Expand Down
14 changes: 7 additions & 7 deletions ci/ci-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#!/usr/bin/env bash

#OPENEBS_OPERATOR=https://raw.githubusercontent.com/openebs/openebs/HEAD/k8s/openebs-operator.yaml
NDM_OPERATOR=https://raw.githubusercontent.com/openebs/cstor-operators/HEAD/deploy/ndm-operator.yaml
CSTOR_RBAC=https://raw.githubusercontent.com/openebs/cstor-operators/HEAD/deploy/rbac.yaml
#NDM_OPERATOR=https://raw.githubusercontent.com/openebs/cstor-operators/HEAD/deploy/ndm-operator.yaml
#CSTOR_RBAC=https://raw.githubusercontent.com/openebs/cstor-operators/HEAD/deploy/rbac.yaml
CSTOR_OPERATOR=https://raw.githubusercontent.com/openebs/cstor-operators/HEAD/deploy/cstor-operator.yaml
ALL_CRD=https://raw.githubusercontent.com/openebs/cstor-operators/HEAD/deploy/crds/all_cstor_crds.yaml
#ALL_CRD=https://raw.githubusercontent.com/openebs/cstor-operators/HEAD/deploy/crds/all_cstor_crds.yaml

CSI_OPERATOR="$GOPATH/src/github.com/openebs/cstor-csi/deploy/csi-operator.yaml"
SNAPSHOT_CLASS="$GOPATH/src/github.com/openebs/cstor-csi/deploy/snapshot-class.yaml"
Expand All @@ -28,10 +28,10 @@ SNAPSHOT_CLASS="$GOPATH/src/github.com/openebs/cstor-csi/deploy/snapshot-class.y

# Prepare env for runnging BDD tests
# Minikube is already running
kubectl apply -f $CSTOR_RBAC
kubectl apply -f $NDM_OPERATOR
kubectl apply -f $ALL_CRD
kubectl apply -f $CSTOR_OPERATOR
#kubectl apply -f $CSTOR_RBAC
#kubectl apply -f $NDM_OPERATOR
#kubectl apply -f $ALL_CRD
kubectl apply -f "$CSTOR_OPERATOR"
kubectl apply -f ./deploy/csi-operator.yaml
kubectl apply -f ./deploy/snapshot-class.yaml

Expand Down
Loading

0 comments on commit 1cc3661

Please sign in to comment.