NO-ISSUE: testing go1.20 in all packages (#5850)

* NO-ISSUE: testing go1.20 in all packages * NO-ISSUE: Remove unneeded functions
openshift · Jan 14, 2024 · f553e3a · f553e3a
1 parent 7476eeb
commit f553e3a
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 27 deletions.
diff --git a/api/go.mod b/api/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift/assisted-service/api
 
-go 1.18
+go 1.20
 
 require (
 	github.com/openshift/assisted-service/models v0.0.0

diff --git a/api/vendor/modules.txt b/api/vendor/modules.txt
@@ -81,7 +81,7 @@ github.com/openshift/api/config/v1
 ## explicit; go 1.18
 github.com/openshift/assisted-service/pkg/validations
 # github.com/openshift/assisted-service/models v0.0.0 => ../models
-## explicit; go 1.18
+## explicit; go 1.20
 github.com/openshift/assisted-service/models
 # github.com/openshift/custom-resource-status v1.1.2
 ## explicit; go 1.12

diff --git a/client/go.mod b/client/go.mod
diff --git a/client/vendor/modules.txt b/client/vendor/modules.txt
diff --git a/deploy/operator/deploy.sh b/deploy/operator/deploy.sh
@@ -35,8 +35,6 @@ function setup_disconnected_parameters() {
 
     merge_authfiles "${PULL_SECRET_FILE}" "${REGISTRY_CREDS}" "${AUTHFILE}"
 
-    ${__root}/hack/setup_env.sh hive_from_upstream
-
     ocp_mirror_release \
         "${PULL_SECRET_FILE}" \
         "${ASSISTED_OPENSHIFT_INSTALL_RELEASE_IMAGE}" \

diff --git a/hack/setup_env.sh b/hack/setup_env.sh
@@ -6,23 +6,10 @@ set -o errexit
 set -o xtrace
 
 function print_help() {
-  ALL_FUNCS="golang|assisted_service|hive_from_upstream|print_help"
+  ALL_FUNCS="assisted_service|print_help"
   echo "Usage: bash ${0} (${ALL_FUNCS})"
 }
 
-function golang() {
-  echo "Installing golang..."
-  curl --retry 5 --connect-timeout 30 -L https://storage.googleapis.com/golang/getgo/installer_linux -o /tmp/golang_installer
-  chmod u+x /tmp/golang_installer
-  /tmp/golang_installer -version 1.18
-  rm /tmp/golang_installer
-
-  echo "Activating go command on current shell..."
-  set +u
-  source /root/.bash_profile
-  set -u
-}
-
 function spectral() {
   echo "Installing spectral..."
   curl --retry 5 --connect-timeout 30 -L https://github.com/stoplightio/spectral/releases/download/v5.9.1/spectral-linux -o /usr/local/bin/spectral
@@ -99,9 +86,6 @@ function assisted_service() {
   python3 -m pip install --no-cache-dir -r ./dev-requirements.txt
 }
 
-function hive_from_upstream() {
-  golang
-}
 
 declare -F $@ || (print_help && exit 1)
 

diff --git a/models/go.mod b/models/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift/assisted-service/models
 
-go 1.18
+go 1.20
 
 require (
 	github.com/go-openapi/errors v0.20.3

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -699,12 +699,12 @@ github.com/openshift/assisted-image-service/pkg/isoeditor
 github.com/openshift/assisted-image-service/pkg/overlay
 github.com/openshift/assisted-image-service/pkg/servers
 # github.com/openshift/assisted-service/api v0.0.0 => ./api
-## explicit; go 1.18
+## explicit; go 1.20
 github.com/openshift/assisted-service/api/common
 github.com/openshift/assisted-service/api/hiveextension/v1beta1
 github.com/openshift/assisted-service/api/v1beta1
 # github.com/openshift/assisted-service/client v0.0.0 => ./client
-## explicit; go 1.18
+## explicit; go 1.20
 github.com/openshift/assisted-service/client
 github.com/openshift/assisted-service/client/events
 github.com/openshift/assisted-service/client/installer
@@ -713,7 +713,7 @@ github.com/openshift/assisted-service/client/manifests
 github.com/openshift/assisted-service/client/operators
 github.com/openshift/assisted-service/client/versions
 # github.com/openshift/assisted-service/models v0.0.0 => ./models
-## explicit; go 1.18
+## explicit; go 1.20
 github.com/openshift/assisted-service/models
 # github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1
 ## explicit; go 1.20