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.

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

THREESCALE-9984: go1.19 #844

Merged
merged 1 commit into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ commands:
steps:
- restore_cache:
keys:
- threescale-operator-go-mod-v2-{{ arch }}-{{ checksum "go.sum" }}
- threescale-operator-go-mod-v3-{{ arch }}-{{ checksum "go.sum" }}
# Find the most recently generated cache used from any branch
- threescale-operator-go-mod-v2-{{ arch }}
- threescale-operator-go-mod-v3-{{ arch }}
- run:
name: Install go dependencies
command: |
make download
- save_cache:
key: threescale-operator-go-mod-v2-{{ arch }}-{{ checksum "go.sum" }}
key: threescale-operator-go-mod-v3-{{ arch }}-{{ checksum "go.sum" }}
paths:
- "/go/pkg/mod"

Expand All @@ -95,7 +95,7 @@ commands:
jobs:
install-operator:
docker:
- image: cimg/go:1.18
- image: cimg/go:1.19
working_directory: ~/project/3scale-operator
steps:
- setup_remote_docker:
Expand All @@ -113,7 +113,7 @@ jobs:

build-operator-image-only:
docker:
- image: cimg/go:1.18
- image: cimg/go:1.19
working_directory: ~/project/3scale-operator
steps:
- setup_remote_docker:
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:

run-unit-tests:
docker:
- image: cimg/go:1.18
- image: cimg/go:1.19
resource_class: large
steps:
- unit-tests
Expand All @@ -180,22 +180,22 @@ jobs:

test-crds:
docker:
- image: cimg/go:1.18
- image: cimg/go:1.19
steps:
- checkout
- install-dependencies
- run: make test-crds

test-manifests-version:
docker:
- image: cimg/go:1.18
- image: cimg/go:1.19
steps:
- checkout
- install-dependencies
- run: make test-manifests-version
license-check:
docker:
- image: cimg/go:1.18
- image: cimg/go:1.19
steps:
- run:
name: Installing ruby
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:

unit-tests-coverage:
docker:
- image: cimg/go:1.18
- image: cimg/go:1.19
resource_class: large
steps:
- unit-tests
Expand All @@ -235,7 +235,7 @@ jobs:

bundle-validate:
docker:
- image: cimg/go:1.18
- image: cimg/go:1.19
steps:
- checkout
- install-operator-sdk
Expand All @@ -244,15 +244,15 @@ jobs:

assets-validate:
docker:
- image: cimg/go:1.18
- image: cimg/go:1.19
steps:
- checkout
- install-operator-sdk
- run: make assets-update-test

prometheusrules-validate:
docker:
- image: cimg/go:1.18
- image: cimg/go:1.19
steps:
- checkout
- run: make prometheusrules-update-test
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.18.10 as builder
FROM golang:1.19.10 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand All @@ -18,7 +18,7 @@ COPY pkg/ pkg/
COPY version/ version/

# Build
RUN CGO_ENABLED=0 GOOS=linux GOARCH=`go env GOARCH` GO111MODULE=on go build -a -o manager main.go
RUN CGO_ENABLED=0 GOOS=linux GOARCH=`go env GOARCH` go build -a -o manager main.go

# Use distroless as minimal base image to package the manager binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details
Expand Down
2 changes: 1 addition & 1 deletion doc/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Generated using [github-markdown-toc](https://github.com/ekalinin/github-markdow
* [operator-sdk] version v1.2.0
* [docker] version 17.03+
* [git][git_tool]
* [go] version 1.18+
* [go] version 1.19+
* [kubernetes] version v1.13.0+
* [oc] version v4.1+
* Access to a Openshift v4.8.0+ cluster.
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/3scale/3scale-operator

go 1.18
go 1.19

require (
github.com/3scale/3scale-porta-go-client v0.9.0
Expand Down
12 changes: 7 additions & 5 deletions pkg/assets/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.