Skip to content

Commit

Permalink
Update go from 1.13 to 1.14 (#348)
Browse files Browse the repository at this point in the history
* Updating to 1.14 in Dockerfiles and go.mod

* Update GH actions yaml

* Update README

* Fix client-go codegen
  • Loading branch information
jimdickinson authored Jan 8, 2021
1 parent b5f03c4 commit 7d4a245
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/kindIntegTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ jobs:
runs-on: ubuntu-latest
env:
GOPATH: /home/runner/go
GOROOT: /usr/local/go1.13
GOROOT: /usr/local/go1.14
steps:
- uses: actions/checkout@v2
if: github.event_name == 'pull_request'
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: actions/checkout@v2
if: github.event_name != 'pull_request'
- name: Set up Go 1.13
- name: Set up Go 1.14
uses: actions/setup-go@v1
with:
go-version: 1.13
go-version: 1.14
- name: Install Mage
run: |
cd /tmp
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/operatorBuildAndDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ jobs:
runs-on: ubuntu-latest
env:
GOPATH: /home/runner/go
GOROOT: /usr/local/go1.13
GOROOT: /usr/local/go1.14
steps:
- uses: actions/checkout@v2
if: github.event_name == 'pull_request'
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: actions/checkout@v2
if: github.event_name != 'pull_request'
- name: Set up Go 1.13
- name: Set up Go 1.14
uses: actions/setup-go@v1
with:
go-version: 1.13
go-version: 1.14
- name: Install Mage
run: |
cd /tmp
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ features.
Almost every build, test, or development task requires the following
pre-requisites...

* Golang 1.13
* Golang 1.14
* Docker, either the docker.io packages on Ubuntu, Docker Desktop for Mac,
or your preferred docker distribution.
* [mage](https://magefile.org/): There are some tips for using mage in
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/datastax/cass-operator

go 1.13
go 1.14

require (
github.com/Jeffail/gabs v1.4.0
Expand Down
2 changes: 1 addition & 1 deletion mage/operator/lib.go
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ func doGenerateClient() {
runArgs := []string{"-t", "--rm", "-u", fmt.Sprintf("%s:%s", usr.Uid, usr.Gid)}
execArgs := []string{"client", "github.com/datastax/cass-operator/operator/pkg/generated",
"github.com/datastax/cass-operator/operator/pkg/apis", "cassandra:v1beta1"}
volumes := []string{fmt.Sprintf("%s/operator:/go/src/github.com/datastax/cass-operator/operator", cwd)}
volumes := []string{fmt.Sprintf("%s:/go/src/github.com/datastax/cass-operator", cwd)}
dockerutil.Run(genClientImage, volumes, nil, nil, runArgs, execArgs).ExecVPanic()
}

Expand Down
2 changes: 1 addition & 1 deletion operator/docker/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ARG BASE_OS=datastax/doesnotexist

# "builder" compiles and tests the code
# This stage name is important to the Cloud Platform CI/CD infrastructure, and should be preserved
FROM --platform=${BUILDPLATFORM} golang:1.13-stretch as builder
FROM --platform=${BUILDPLATFORM} golang:1.14-stretch as builder

# Disable cgo - this makes static binaries that will work on an Alpine image
ENV CGO_ENABLED=0
Expand Down
2 changes: 1 addition & 1 deletion tools/k8s-code-generator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# We use the K8s code-generator to generate client boilerplate for our operator.
# More information can be found at: https://github.com/kubernetes/code-generator
FROM golang:1.13-stretch
FROM golang:1.14-stretch

ENV CGO_ENABLED=0
ENV GOPROXY=https://proxy.golang.org,https://gocenter.io,direct
Expand Down
4 changes: 2 additions & 2 deletions tools/operator-sdk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
##############################################

FROM golang:1.13-stretch as install-operator-sdk
FROM golang:1.14-stretch as install-operator-sdk

# This Dockerfile sets up a clean go 1.13 environment with operator-sdk installed and tested.
# This Dockerfile sets up a clean go 1.14 environment with operator-sdk installed and tested.
#
# It is not part of any operator build system, but rather exists to serve as reference clean
# install of operator-sdk (pinned to a released version), their example project, and the kubernetes
Expand Down

0 comments on commit 7d4a245

Please sign in to comment.