This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-operator.git
The following commit(s) were added to refs/heads/main by this push:
new dd67747 Upgrade GoLang to v1.17 (#408)
dd67747 is described below
commit dd67747ddf83b2511bcfb68c602603c3f2534310
Author: Houston Putman <[email protected]>
AuthorDate: Mon Feb 14 11:40:44 2022 -0500
Upgrade GoLang to v1.17 (#408)
---
.github/workflows/tests.yaml | 2 +-
api/v1beta1/zz_generated.deepcopy.go | 1 +
build/Dockerfile | 2 +-
controllers/zk_api/zz_generated.deepcopy.go | 1 +
go.mod | 62 ++++++++++++++++++++++++++++-
hack/release/wizard/releaseWizard.py | 2 -
hack/release/wizard/releaseWizard.yaml | 4 +-
helm/solr-operator/Chart.yaml | 7 ++++
8 files changed, 74 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 20d297d..9211af3 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
- go: [ '1.16' ]
+ go: [ '1.17' ]
steps:
# Setup
diff --git a/api/v1beta1/zz_generated.deepcopy.go
b/api/v1beta1/zz_generated.deepcopy.go
index 48faefb..6d99a33 100644
--- a/api/v1beta1/zz_generated.deepcopy.go
+++ b/api/v1beta1/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
// +build !ignore_autogenerated
/*
diff --git a/build/Dockerfile b/build/Dockerfile
index 6c61ad3..121258b 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -11,7 +11,7 @@
# limitations under the License.
# Build the manager binary
-FROM golang:1.16 as builder
+FROM golang:1.17 as builder
WORKDIR /workspace
ARG GO111MODULE=on
diff --git a/controllers/zk_api/zz_generated.deepcopy.go
b/controllers/zk_api/zz_generated.deepcopy.go
index 1290077..1fe4317 100644
--- a/controllers/zk_api/zz_generated.deepcopy.go
+++ b/controllers/zk_api/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
// +build !ignore_autogenerated
/*
diff --git a/go.mod b/go.mod
index 66ec805..ccd52b9 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/apache/solr-operator
-go 1.16
+go 1.17
require (
github.com/fsnotify/fsnotify v1.4.9
@@ -17,6 +17,66 @@ require (
sigs.k8s.io/controller-runtime v0.8.3
)
+require (
+ cloud.google.com/go v0.54.0 // indirect
+ github.com/Azure/go-autorest v14.2.0+incompatible // indirect
+ github.com/Azure/go-autorest/autorest v0.11.1 // indirect
+ github.com/Azure/go-autorest/autorest/adal v0.9.5 // indirect
+ github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
+ github.com/Azure/go-autorest/logger v0.2.0 // indirect
+ github.com/Azure/go-autorest/tracing v0.6.0 // indirect
+ github.com/beorn7/perks v1.0.1 // indirect
+ github.com/cespare/xxhash/v2 v2.1.1 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 //
indirect
+ github.com/evanphx/json-patch v4.9.0+incompatible // indirect
+ github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
+ github.com/go-logr/zapr v0.2.0 // indirect
+ github.com/gogo/protobuf v1.3.1 // indirect
+ github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e //
indirect
+ github.com/golang/protobuf v1.5.2 // indirect
+ github.com/google/go-cmp v0.5.5 // indirect
+ github.com/google/gofuzz v1.1.0 // indirect
+ github.com/google/uuid v1.1.2 // indirect
+ github.com/googleapis/gnostic v0.5.1 // indirect
+ github.com/hashicorp/golang-lru v0.5.4 // indirect
+ github.com/imdario/mergo v0.3.10 // indirect
+ github.com/json-iterator/go v1.1.10 // indirect
+ github.com/matttproud/golang_protobuf_extensions
v1.0.2-0.20181231171920-c182affec369 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd //
indirect
+ github.com/modern-go/reflect2 v1.0.1 // indirect
+ github.com/nxadm/tail v1.4.8 // indirect
+ github.com/pkg/errors v0.9.1 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/prometheus/client_golang v1.7.1 // indirect
+ github.com/prometheus/client_model v0.2.0 // indirect
+ github.com/prometheus/common v0.10.0 // indirect
+ github.com/prometheus/procfs v0.2.0 // indirect
+ github.com/spf13/pflag v1.0.5 // indirect
+ go.uber.org/atomic v1.6.0 // indirect
+ go.uber.org/multierr v1.5.0 // indirect
+ go.uber.org/zap v1.15.0 // indirect
+ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
+ golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
+ golang.org/x/sys v0.0.0-20210423082822-04245dca01da // indirect
+ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
+ golang.org/x/text v0.3.6 // indirect
+ golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
+ gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
+ google.golang.org/appengine v1.6.6 // indirect
+ google.golang.org/protobuf v1.26.0 // indirect
+ gopkg.in/inf.v0 v0.9.1 // indirect
+ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
+ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
+ k8s.io/apiextensions-apiserver v0.20.1 // indirect
+ k8s.io/component-base v0.20.2 // indirect
+ k8s.io/klog/v2 v2.4.0 // indirect
+ k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
+ sigs.k8s.io/yaml v1.2.0 // indirect
+)
+
// These are to fix security vulnerabilities. Remove whenever these are the
default versions used
replace (
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
diff --git a/hack/release/wizard/releaseWizard.py
b/hack/release/wizard/releaseWizard.py
index e73a913..89002ff 100755
--- a/hack/release/wizard/releaseWizard.py
+++ b/hack/release/wizard/releaseWizard.py
@@ -66,8 +66,6 @@ from consolemenu.items import FunctionItem, SubmenuItem,
ExitItem
from consolemenu.screen import Screen
from scriptutil import BranchType, Version, download, run
-# SolrOperator-to-GoLang version mapping
-go_versions = {"0.3": "1.16"}
editor = None
# Edit this to add other global jinja2 variables or filters
diff --git a/hack/release/wizard/releaseWizard.yaml
b/hack/release/wizard/releaseWizard.yaml
index 9323dcb..a8bb62e 100644
--- a/hack/release/wizard/releaseWizard.yaml
+++ b/hack/release/wizard/releaseWizard.yaml
@@ -223,7 +223,7 @@ groups:
You will need these tools:
* Python v3.4 or later, with dependencies listed in requirements.txt
- * Go 1.16
+ * Go 1.17
* gpg
* git
* svn
@@ -898,7 +898,7 @@ groups:
Make sure you have the following installed before running the smoke test:
- Docker (Give it enough memory and CPU to run ~12 containers, 3 of
which are Solr nodes)
More information on required resources can be found here:
https://kind.sigs.k8s.io/docs/user/quick-start/#settings-for-docker-desktop
- - Go 1.16
+ - Go 1.17
- Kubectl
- GnuPG
- Helm v3.4.0+
diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml
index cda7d4c..7b3f4e1 100644
--- a/helm/solr-operator/Chart.yaml
+++ b/helm/solr-operator/Chart.yaml
@@ -98,6 +98,13 @@ annotations:
url: https://github.com/apache/solr-operator/issues/405
- name: Github PR
url: https://github.com/apache/solr-operator/pull/406
+ - kind: changed
+ description: Upgrade GoLang version to 1.17
+ links:
+ - name: Github Issue
+ url: https://github.com/apache/solr-operator/issues/407
+ - name: Github PR
+ url: https://github.com/apache/solr-operator/pull/408
artifacthub.io/images: |
- name: solr-operator
image: apache/solr-operator:v0.6.0-prerelease
