go 1.21

michael-valdron · michael-valdron · commit ff82b5a26e8b · 2024-06-12T10:07:29.000-04:00
Signed-off-by: Michael Valdron &lt;mvaldron@redhat.com&gt;
diff --git a/.ci/Dockerfile b/.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
diff --git a/.ci/Dockerfile.offline b/.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
diff --git a/.ci/openshift_integration.sh b/.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
diff --git a/.devfile.yaml b/.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:
diff --git a/.github/workflows/ci.yaml b/.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 
 
diff --git a/.github/workflows/pushimge-next.yaml b/.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
diff --git a/.github/workflows/validate-samples.yaml b/.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/ginkgo@v2.13.0
diff --git a/.github/workflows/validate-stacks.yaml b/.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/ginkgo@v2.13.0
@@ -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: |
diff --git a/README.md b/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]
 
diff --git a/tests/README.md b/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`)
 
diff --git a/tests/odov3/go.mod b/tests/odov3/go.mod
@@ -1,6 +1,6 @@
 module github.com/devfile/registry/tests/odov3
 
-go 1.19
+go 1.21
 
 require (
 	github.com/devfile/api/v2 v2.2.2
diff --git a/tests/odov3/go.sum b/tests/odov3/go.sum
diff --git a/tests/odov3/odo_test.go b/tests/odov3/odo_test.go
diff --git a/tests/validate_devfile_schemas/go.mod b/tests/validate_devfile_schemas/go.mod
diff --git a/tests/validate_devfile_schemas/go.sum b/tests/validate_devfile_schemas/go.sum
diff --git a/tests/validate_devfile_schemas/validate_devfile_schemas_test.go b/tests/validate_devfile_schemas/validate_devfile_schemas_test.go
