Upgrade devfile registry testing modules & CI to Go 1.21 (#420)

* go 1.21

Signed-off-by: Michael Valdron <[email protected]>

* bump k8s to 0.29.2

Signed-off-by: Michael Valdron <[email protected]>

---------

Signed-off-by: Michael Valdron <[email protected]>

Author: michael-valdron

.ci/Dockerfile

@@ -12,7 +12,7 @@
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
-FROM registry.access.redhat.com/ubi8/go-toolset:1.19 AS builder
+FROM registry.access.redhat.com/ubi8/go-toolset:1.21 AS builder
 
 # Set user as root
 USER root

.ci/Dockerfile.offline

@@ -12,7 +12,7 @@
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
-FROM registry.access.redhat.com/ubi8/go-toolset:1.19 AS builder
+FROM registry.access.redhat.com/ubi8/go-toolset:1.21 AS builder
 
 # Set user as root
 USER root

.ci/openshift_integration.sh

@@ -27,6 +27,9 @@ set -x
 # Disable telemtry for odo
 export ODO_DISABLE_TELEMETRY=true
 
+# Set yq version
+YQ_VERSION=${YQ_VERSION:-v4.44.1}
+
 # Split the registry image and image tag from the REGISTRY_IMAGE env variable
 IMG="$(echo $REGISTRY_IMAGE | cut -d':' -f1)"
 TAG="$(echo $REGISTRY_IMAGE | cut -d':' -f2)"
@@ -35,7 +38,7 @@ TAG="$(echo $REGISTRY_IMAGE | cut -d':' -f2)"
 oc new-project devfile-registry-test
 
 # Install yq
-curl -sL https://github.com/mikefarah/yq/releases/download/v4.9.5/yq_linux_amd64 -o yq && chmod +x yq
+curl -sL https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -o yq && chmod +x yq
 YQ_PATH=$(realpath yq)
 
 # Download odo

.devfile.yaml

@@ -43,7 +43,7 @@ components:
 # Alternatively could be removed once https://github.com/redhat-developer/odo/issues/7162 is resolved
   - name: index-generator
     container:
-      image: registry.access.redhat.com/ubi8/go-toolset:1.19
+      image: registry.access.redhat.com/ubi8/go-toolset:1.21
 # Devfile Registry Deployment resource
   - name: devfile-registry-deployment
     kubernetes:

.github/workflows/ci.yaml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: 1.19
+          go-version: 1.21
       - name: Set up QEMU # Enables arm64 image building
         uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 
 

.github/workflows/devfile-ci.yaml

@@ -45,7 +45,7 @@ jobs:
         uses: manusa/actions-setup-minikube@92af4db914ab207f837251cd53eb7060e6477614 # v2.11.0
         with:
           minikube version: 'v1.31.2'
-          kubernetes version: 'v1.26.3'
+          kubernetes version: 'v1.29.2'
           driver: 'docker'
           github token: ${{ secrets.GITHUB_TOKEN }}
           start args: '--addons ingress --memory 4096 --cpus 2'

.github/workflows/pushimge-next.yaml

@@ -41,7 +41,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: 1.13
+          go-version: 1.21
       - name: Set up QEMU # Enables arm64 image building
         uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 
       - name: Login to Quay

.github/workflows/validate-samples.yaml

@@ -44,7 +44,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: "1.19"
+          go-version: "1.21"
 
       - name: Install Ginkgo
         run: go install -mod=mod github.com/onsi/ginkgo/v2/[email protected]

.github/workflows/validate-stacks.yaml

@@ -46,7 +46,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: "1.19"
+          go-version: "1.21"
 
       - name: Install Ginkgo
         run: go install -mod=mod github.com/onsi/ginkgo/v2/[email protected]
@@ -161,7 +161,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: "1.19"
+          go-version: "1.21"
 
       - name: Install odo latest version
         run: |

README.md

@@ -6,7 +6,7 @@ The public registry is updated weekly, by 12pm EST Wednesdays, with any updated
 
 ## Registry Status
 
-![Go](https://img.shields.io/badge/Go-1.19-blue)
+![Go](https://img.shields.io/badge/Go-1.21-blue)
 [![Validate Devfile stacks](https://github.com/devfile/registry/actions/workflows/validate-stacks.yaml/badge.svg?event=schedule)](https://github.com/devfile/registry/actions/workflows/validate-stacks.yaml)
 [![Renovate][1]][2]
 

tests/README.md

@@ -53,7 +53,7 @@ STACKS_DIR=.cache/samples bash tests/validate_devfile_schemas.sh --samples
     - `minikube start --memory 8gb` is a good starting point.
     - The `none` driver **cannot** be used. Any other driver (`docker`, `hyperkit`, etc) should suffice.
 - odo v3.0.0-rc2 or later.
-- Go 1.19 or later installed
+- Go 1.21 or later installed
   - `$GOPATH/bin` should be in your `$PATH` or you will have to modify `check_with_odov3.sh` to find `ginkgo` binary.
 - Ginkgo CLI installed (`go install github.com/onsi/ginkgo/v2/ginkgo@latest`)
 

tests/odov3/go.mod

@@ -1,10 +1,10 @@
 module github.com/devfile/registry/tests/odov3
 
-go 1.19
+go 1.21
 
 require (
-	github.com/devfile/api/v2 v2.2.2
-	github.com/devfile/library/v2 v2.2.2
+	github.com/devfile/api/v2 v2.3.0
+	github.com/devfile/library/v2 v2.2.3-0.20240612082351-45a4cc4d3504
 	github.com/onsi/ginkgo/v2 v2.13.0
 	github.com/onsi/gomega v1.29.0
 )
@@ -22,8 +22,8 @@ require (
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/devfile/registry-support/index/generator v0.0.0-20240311135803-6215550f93d4 // indirect
-	github.com/devfile/registry-support/registry-library v0.0.0-20240328155806-7c89891a72ce // indirect
+	github.com/devfile/registry-support/index/generator v0.0.0-20240419194226-cca4c9a81f8d // indirect
+	github.com/devfile/registry-support/registry-library v0.0.0-20240521161747-89fc566cb024 // indirect
 	github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 // indirect
 	github.com/distribution/reference v0.5.0 // indirect
 	github.com/docker/cli v25.0.1+incompatible // indirect
@@ -32,7 +32,7 @@ require (
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fatih/color v1.14.1 // indirect
@@ -43,20 +43,21 @@ require (
 	github.com/go-git/go-git/v5 v5.11.0 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.0.1 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
+	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -69,7 +70,7 @@ require (
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/compress v1.17.7 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -84,10 +85,10 @@ require (
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.14.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/client_golang v1.16.0 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skeema/knownhosts v1.2.1 // indirect
@@ -119,17 +120,17 @@ require (
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.26.10 // indirect
-	k8s.io/apiextensions-apiserver v0.26.10 // indirect
-	k8s.io/apimachinery v0.26.10 // indirect
-	k8s.io/client-go v0.26.10 // indirect
+	k8s.io/api v0.29.2 // indirect
+	k8s.io/apiextensions-apiserver v0.29.2 // indirect
+	k8s.io/apimachinery v0.29.2 // indirect
+	k8s.io/client-go v0.29.2 // indirect
 	k8s.io/klog v1.0.0 // indirect
-	k8s.io/klog/v2 v2.90.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	oras.land/oras-go v1.2.5 // indirect
 	sigs.k8s.io/controller-runtime v0.14.7 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )