You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/07/28 13:58:23 UTC
[camel-k] 01/03: feat(build): Upgrade to Golang 1.20
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 20f5c568094095b22d1d0c54b973db6a2fbcc8fc
Author: Gaelle Fournier <ga...@gmail.com>
AuthorDate: Thu Jul 27 15:40:53 2023 +0200
feat(build): Upgrade to Golang 1.20
---
.github/actions/kamel-prepare-env/action.yml | 2 +-
.github/workflows/coverage.yml | 2 +-
.github/workflows/nightly-automatic-updates.yml | 2 +-
.github/workflows/nightly-release.yml | 2 +-
.github/workflows/validate.yml | 2 +-
.../strimzi/duck/client/internalclientset/fake/register.go | 14 +++++++-------
.../duck/client/internalclientset/scheme/register.go | 14 +++++++-------
build/Dockerfile | 2 +-
go.mod | 2 +-
pkg/apis/camel/go.mod | 2 +-
pkg/client/camel/clientset/versioned/fake/register.go | 14 +++++++-------
pkg/client/camel/clientset/versioned/scheme/register.go | 14 +++++++-------
pkg/client/camel/go.mod | 2 +-
pkg/kamelet/repository/go.mod | 2 +-
14 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/.github/actions/kamel-prepare-env/action.yml b/.github/actions/kamel-prepare-env/action.yml
index 78e169cae..45b1c892d 100644
--- a/.github/actions/kamel-prepare-env/action.yml
+++ b/.github/actions/kamel-prepare-env/action.yml
@@ -74,7 +74,7 @@ runs:
uses: actions/setup-go@v4
if: ${{ env.KAMEL_PREPARE_ENV != 'true' }}
with:
- go-version: 1.18.x
+ go-version: 1.20.x
- name: (Re-)install kustomize
shell: bash
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 311386d0b..18d54fa65 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -35,7 +35,7 @@ jobs:
- name: Setup go
uses: actions/setup-go@v3
with:
- go-version: '1.18'
+ go-version: '1.20'
check-latest: true
- name: Prepare repo configuration
diff --git a/.github/workflows/nightly-automatic-updates.yml b/.github/workflows/nightly-automatic-updates.yml
index 7e44fb83a..fcdc02e1f 100644
--- a/.github/workflows/nightly-automatic-updates.yml
+++ b/.github/workflows/nightly-automatic-updates.yml
@@ -47,4 +47,4 @@ jobs:
with:
branch-ref: ${{ matrix.ref-branch }}
secretGithubToken: ${{ secrets.GITHUB_TOKEN }}
- goVersion: "1.18.x"
+ goVersion: "1.20.x"
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
index fce3b553a..850f9c8b7 100644
--- a/.github/workflows/nightly-release.yml
+++ b/.github/workflows/nightly-release.yml
@@ -49,7 +49,7 @@ jobs:
- name: Release nightly ${{ matrix.ref-branch }} branch
uses: ./.github/actions/release-nightly
with:
- goVersion: "1.18.x"
+ goVersion: "1.20.x"
javaVersion: "17"
secretE2ECluster: ${{ secrets.E2E_CLUSTER_CONFIG }}
secretE2EKube: ${{ secrets.E2E_KUBE_CONFIG }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index abfb30782..8ddfd1656 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -44,7 +44,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
- go-version: 1.18.x
+ go-version: 1.20.x
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
env:
diff --git a/addons/strimzi/duck/client/internalclientset/fake/register.go b/addons/strimzi/duck/client/internalclientset/fake/register.go
index 53a4309e7..e6ac15499 100644
--- a/addons/strimzi/duck/client/internalclientset/fake/register.go
+++ b/addons/strimzi/duck/client/internalclientset/fake/register.go
@@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
// AddToScheme adds all types of this clientset into the given scheme. This allows composition
// of clientsets, like in:
//
-// import (
-// "k8s.io/client-go/kubernetes"
-// clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-// )
+// import (
+// "k8s.io/client-go/kubernetes"
+// clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+// )
//
-// kclientset, _ := kubernetes.NewForConfig(c)
-// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+// kclientset, _ := kubernetes.NewForConfig(c)
+// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
//
// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
// correctly.
diff --git a/addons/strimzi/duck/client/internalclientset/scheme/register.go b/addons/strimzi/duck/client/internalclientset/scheme/register.go
index 11f233b92..6abeca247 100644
--- a/addons/strimzi/duck/client/internalclientset/scheme/register.go
+++ b/addons/strimzi/duck/client/internalclientset/scheme/register.go
@@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
// AddToScheme adds all types of this clientset into the given scheme. This allows composition
// of clientsets, like in:
//
-// import (
-// "k8s.io/client-go/kubernetes"
-// clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-// )
+// import (
+// "k8s.io/client-go/kubernetes"
+// clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+// )
//
-// kclientset, _ := kubernetes.NewForConfig(c)
-// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+// kclientset, _ := kubernetes.NewForConfig(c)
+// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
//
// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
// correctly.
diff --git a/build/Dockerfile b/build/Dockerfile
index 212ba3033..9d3ee2fd8 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -60,7 +60,7 @@ USER 1001:0
ADD build/_output/bin/kamel /usr/local/bin/kamel
-FROM golang:1.18 as go
+FROM golang:1.20 as go
RUN go install github.com/go-delve/delve/cmd/dlv@latest
diff --git a/go.mod b/go.mod
index 88d0eaf0d..c30ce8673 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/apache/camel-k/v2
-go 1.18
+go 1.20
require (
github.com/Masterminds/semver v1.5.0
diff --git a/pkg/apis/camel/go.mod b/pkg/apis/camel/go.mod
index e3c991736..7f9c7ec6b 100644
--- a/pkg/apis/camel/go.mod
+++ b/pkg/apis/camel/go.mod
@@ -1,6 +1,6 @@
module github.com/apache/camel-k/v2/pkg/apis/camel
-go 1.18
+go 1.20
require (
github.com/imdario/mergo v0.3.13
diff --git a/pkg/client/camel/clientset/versioned/fake/register.go b/pkg/client/camel/clientset/versioned/fake/register.go
index 249a2b9e3..d55e6d595 100644
--- a/pkg/client/camel/clientset/versioned/fake/register.go
+++ b/pkg/client/camel/clientset/versioned/fake/register.go
@@ -40,14 +40,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
// AddToScheme adds all types of this clientset into the given scheme. This allows composition
// of clientsets, like in:
//
-// import (
-// "k8s.io/client-go/kubernetes"
-// clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-// )
+// import (
+// "k8s.io/client-go/kubernetes"
+// clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+// )
//
-// kclientset, _ := kubernetes.NewForConfig(c)
-// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+// kclientset, _ := kubernetes.NewForConfig(c)
+// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
//
// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
// correctly.
diff --git a/pkg/client/camel/clientset/versioned/scheme/register.go b/pkg/client/camel/clientset/versioned/scheme/register.go
index 9366fb20c..493d56e4c 100644
--- a/pkg/client/camel/clientset/versioned/scheme/register.go
+++ b/pkg/client/camel/clientset/versioned/scheme/register.go
@@ -40,14 +40,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
// AddToScheme adds all types of this clientset into the given scheme. This allows composition
// of clientsets, like in:
//
-// import (
-// "k8s.io/client-go/kubernetes"
-// clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-// )
+// import (
+// "k8s.io/client-go/kubernetes"
+// clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+// )
//
-// kclientset, _ := kubernetes.NewForConfig(c)
-// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+// kclientset, _ := kubernetes.NewForConfig(c)
+// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
//
// After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
// correctly.
diff --git a/pkg/client/camel/go.mod b/pkg/client/camel/go.mod
index 4f136bf7a..9abb8fb5a 100644
--- a/pkg/client/camel/go.mod
+++ b/pkg/client/camel/go.mod
@@ -1,6 +1,6 @@
module github.com/apache/camel-k/v2/pkg/client/camel
-go 1.18
+go 1.20
require (
github.com/apache/camel-k/v2/pkg/apis/camel v0.0.0
diff --git a/pkg/kamelet/repository/go.mod b/pkg/kamelet/repository/go.mod
index 6dc83a22c..c7633d1e4 100644
--- a/pkg/kamelet/repository/go.mod
+++ b/pkg/kamelet/repository/go.mod
@@ -1,6 +1,6 @@
module github.com/apache/camel-k/v2/pkg/kamelet/repository
-go 1.18
+go 1.20
require (
github.com/apache/camel-k/v2/pkg/apis/camel v0.0.0