Skip to content

Commit

Permalink
Issue 559: Updating go version to 1.20 (#560)
Browse files Browse the repository at this point in the history
* Issue 559: Updating go version to 1.20

Signed-off-by: anisha.kj <[email protected]>

* Corrected formatting

Signed-off-by: anisha.kj <[email protected]>

* Corrected formatting

Signed-off-by: anisha.kj <[email protected]>

---------

Signed-off-by: anisha.kj <[email protected]>
  • Loading branch information
anishakj authored Jun 22, 2023
1 parent 72bea54 commit 9d283c2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.17
- name: Set up Go 1.20
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: "1.20"
id: go
- name: Set up Go for root
run: |
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG DOCKER_REGISTRY
ARG DISTROLESS_DOCKER_REGISTRY
ARG ALPINE_VERSION=3.17
FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}golang:1.19-alpine${ALPINE_VERSION} as go-builder
ARG ALPINE_VERSION=3.18
FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}golang:1.20-alpine${ALPINE_VERSION} as go-builder

ARG PROJECT_NAME=zookeeper-operator
ARG REPO_PATH=github.com/pravega/$PROJECT_NAME
Expand Down
4 changes: 2 additions & 2 deletions controllers/zookeepercluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ func getRollingRestartAnnotation() (string, string) {
// compareResourceVersion compare resoure versions for the supplied ZookeeperCluster and StatefulSet
// resources
// Returns:
// 0 if versions are equal
// 0 if versions are equal
// -1 if ZookeeperCluster version is less than StatefulSet version
// 1 if ZookeeperCluster version is greater than StatefulSet version
// 1 if ZookeeperCluster version is greater than StatefulSet version
func compareResourceVersion(zk *zookeeperv1beta1.ZookeeperCluster, sts *appsv1.StatefulSet) int {

zkResourceVersion, zkErr := strconv.Atoi(zk.ResourceVersion)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/pravega/zookeeper-operator

go 1.19
go 1.20

require (
github.com/ghodss/yaml v1.0.0
Expand Down

0 comments on commit 9d283c2

Please sign in to comment.