diff --git a/.github/workflows/kindIntegTest.yml b/.github/workflows/kindIntegTest.yml index 8a839c9ec..ae0857c35 100644 --- a/.github/workflows/kindIntegTest.yml +++ b/.github/workflows/kindIntegTest.yml @@ -20,7 +20,7 @@ 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' @@ -28,10 +28,10 @@ jobs: 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 diff --git a/.github/workflows/operatorBuildAndDeploy.yml b/.github/workflows/operatorBuildAndDeploy.yml index 6a38b99a1..6d1772a6f 100644 --- a/.github/workflows/operatorBuildAndDeploy.yml +++ b/.github/workflows/operatorBuildAndDeploy.yml @@ -12,7 +12,7 @@ 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' @@ -20,10 +20,10 @@ jobs: 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 diff --git a/README.md b/README.md index 139d4a17b..9da75ead8 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/go.mod b/go.mod index 6e0a01506..670130ee4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/datastax/cass-operator -go 1.13 +go 1.14 require ( github.com/Jeffail/gabs v1.4.0 diff --git a/mage/operator/lib.go b/mage/operator/lib.go index b6514f7e6..ed68f40d6 100644 --- a/mage/operator/lib.go +++ b/mage/operator/lib.go @@ -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() } diff --git a/operator/docker/base/Dockerfile b/operator/docker/base/Dockerfile index 819998ae2..efc1ff425 100644 --- a/operator/docker/base/Dockerfile +++ b/operator/docker/base/Dockerfile @@ -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 diff --git a/tools/k8s-code-generator/Dockerfile b/tools/k8s-code-generator/Dockerfile index 1235b39be..72c52ab27 100644 --- a/tools/k8s-code-generator/Dockerfile +++ b/tools/k8s-code-generator/Dockerfile @@ -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 diff --git a/tools/operator-sdk/Dockerfile b/tools/operator-sdk/Dockerfile index 5a5614af4..d49532442 100644 --- a/tools/operator-sdk/Dockerfile +++ b/tools/operator-sdk/Dockerfile @@ -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