Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump go modules and k8s libs #177

Merged
merged 2 commits into from
Nov 22, 2023
Merged

chore(deps): bump go modules and k8s libs #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2390d7e
chore(deps): bump go modules and k8s libs
niladrih Nov 22, 2023
b14dd68
chore(deps): update ci go version and installer yamls
niladrih Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/bin
# IDEs
**/.idea
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion buildscripts/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@

# Create a temp dir and clean it up on exit
TEMPDIR=$(mktemp -d -t csi-test.XXX)
trap "rm -rf $TEMPDIR" EXIT HUP INT QUIT TERM

Check warning on line 21 in buildscripts/test.sh

View workflow job for this annotation

GitHub Actions / lint 

[shellcheck] reported by reviewdog 🐶
Use single quotes, otherwise this expands now rather than when signalled. [SC2064](https://github.com/koalaman/shellcheck/wiki/SC2064)

Raw Output:
./buildscripts/test.sh:21:14:warning:Use single quotes, otherwise this expands now rather than when signalled. [SC2064](https://github.com/koalaman/shellcheck/wiki/SC2064)

# Build the Maya binary for the tests
echo "--> Building csi"
go build -o $TEMPDIR/maya || exit 1

Check warning on line 25 in buildscripts/test.sh

View workflow job for this annotation

GitHub Actions / lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./buildscripts/test.sh:25:13:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

# Run the tests
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')

Check warning on line 31 in buildscripts/test.sh

View workflow job for this annotation

GitHub Actions / lint 

[shellcheck] reported by reviewdog 🐶
Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Raw Output:
./buildscripts/test.sh:31:17:info:Double quote to prevent globbing and word splitting. [SC2086](https://github.com/koalaman/shellcheck/wiki/SC2086)

Check warning on line 31 in buildscripts/test.sh

View workflow job for this annotation

GitHub Actions / lint 

[shellcheck] reported by reviewdog 🐶
Quote this to prevent word splitting. [SC2046](https://github.com/koalaman/shellcheck/wiki/SC2046)

Raw Output:
./buildscripts/test.sh:31:55:warning:Quote this to prevent word splitting. [SC2046](https://github.com/koalaman/shellcheck/wiki/SC2046)

3 changes: 2 additions & 1 deletion buildscripts/update-codegen.sh
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@
# limitations under the License.

# shellcheck disable=SC1128
#!/usr/bin/env bash

Check failure on line 16 in ci/ci-test.sh

View workflow job for this annotation

GitHub Actions / lint 

[shellcheck] reported by reviewdog 🐶
The shebang must be on the first line. Delete blanks and move comments. [SC1128](https://github.com/koalaman/shellcheck/wiki/SC1128)

Raw Output:
./ci/ci-test.sh:16:1:error:The shebang must be on the first line. Delete blanks and move comments. [SC1128](https://github.com/koalaman/shellcheck/wiki/SC1128)

#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"

Check warning on line 24 in ci/ci-test.sh

View workflow job for this annotation

GitHub Actions / lint 

[shellcheck] reported by reviewdog 🐶
CSI_OPERATOR appears unused. Verify use (or export if used externally). [SC2034](https://github.com/koalaman/shellcheck/wiki/SC2034)

Raw Output:
./ci/ci-test.sh:24:1:warning:CSI_OPERATOR appears unused. Verify use (or export if used externally). [SC2034](https://github.com/koalaman/shellcheck/wiki/SC2034)
SNAPSHOT_CLASS="$GOPATH/src/github.com/openebs/cstor-csi/deploy/snapshot-class.yaml"

Check warning on line 25 in ci/ci-test.sh

View workflow job for this annotation

GitHub Actions / lint 

[shellcheck] reported by reviewdog 🐶
SNAPSHOT_CLASS appears unused. Verify use (or export if used externally). [SC2034](https://github.com/koalaman/shellcheck/wiki/SC2034)

Raw Output:
./ci/ci-test.sh:25:1:warning:SNAPSHOT_CLASS appears unused. Verify use (or export if used externally). [SC2034](https://github.com/koalaman/shellcheck/wiki/SC2034)

#DST_PATH="$GOPATH/src/github.com/openebs"

# 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 All @@ -57,7 +57,7 @@
kubectl wait --for=condition=Ready --timeout=300s pods/openebs-cstor-csi-controller-0 -n openebs

# Run e2e tests for csi volumes
cd ./tests/e2e

Check warning on line 60 in ci/ci-test.sh

View workflow job for this annotation

GitHub Actions / lint 

[shellcheck] reported by reviewdog 🐶
Use 'cd ... || exit' or 'cd ... || return' in case cd fails. [SC2164](https://github.com/koalaman/shellcheck/wiki/SC2164)

Raw Output:
./ci/ci-test.sh:60:1:warning:Use 'cd ... || exit' or 'cd ... || return' in case cd fails. [SC2164](https://github.com/koalaman/shellcheck/wiki/SC2164)

if ! make e2e-test; then
echo "******************** CSI Controller logs***************************** "
Expand Down
Loading
Loading