Skip to content

Commit c7ff486

Browse files
michael-valdronmichael-valdron
authored
Upgrade devfile registry testing modules & CI to Go 1.21 (#420)
* go 1.21 Signed-off-by: Michael Valdron <mvaldron@redhat.com> * bump k8s to 0.29.2 Signed-off-by: Michael Valdron <mvaldron@redhat.com> --------- Signed-off-by: Michael Valdron <mvaldron@redhat.com>
1 parent 9e980c3 commit c7ff486

17 files changed

+254
-784
lines changed

‎.ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
15-
FROM registry.access.redhat.com/ubi8/go-toolset:1.19 AS builder
15+
FROM registry.access.redhat.com/ubi8/go-toolset:1.21 AS builder
1616

1717
# Set user as root
1818
USER root

‎.ci/Dockerfile.offline

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
15-
FROM registry.access.redhat.com/ubi8/go-toolset:1.19 AS builder
15+
FROM registry.access.redhat.com/ubi8/go-toolset:1.21 AS builder
1616

1717
# Set user as root
1818
USER root

‎.ci/openshift_integration.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ set -x
2727
# Disable telemtry for odo
2828
export ODO_DISABLE_TELEMETRY=true
2929

30+
# Set yq version
31+
YQ_VERSION=${YQ_VERSION:-v4.44.1}
32+
3033
# Split the registry image and image tag from the REGISTRY_IMAGE env variable
3134
IMG="$(echo $REGISTRY_IMAGE | cut -d':' -f1)"
3235
TAG="$(echo $REGISTRY_IMAGE | cut -d':' -f2)"
@@ -35,7 +38,7 @@ TAG="$(echo $REGISTRY_IMAGE | cut -d':' -f2)"
3538
oc new-project devfile-registry-test
3639

3740
# Install yq
38-
curl -sL https://github.com/mikefarah/yq/releases/download/v4.9.5/yq_linux_amd64 -o yq && chmod +x yq
41+
curl -sL https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -o yq && chmod +x yq
3942
YQ_PATH=$(realpath yq)
4043

4144
# Download odo

‎.devfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ components:
4343
# Alternatively could be removed once https://github.com/redhat-developer/odo/issues/7162 is resolved
4444
- name: index-generator
4545
container:
46-
image: registry.access.redhat.com/ubi8/go-toolset:1.19
46+
image: registry.access.redhat.com/ubi8/go-toolset:1.21
4747
# Devfile Registry Deployment resource
4848
- name: devfile-registry-deployment
4949
kubernetes:

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Go environment
3737
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
3838
with:
39-
go-version: 1.19
39+
go-version: 1.21
4040
- name: Set up QEMU # Enables arm64 image building
4141
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3
4242

‎.github/workflows/devfile-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: manusa/actions-setup-minikube@92af4db914ab207f837251cd53eb7060e6477614 # v2.11.0
4646
with:
4747
minikube version: 'v1.31.2'
48-
kubernetes version: 'v1.26.3'
48+
kubernetes version: 'v1.29.2'
4949
driver: 'docker'
5050
github token: ${{ secrets.GITHUB_TOKEN }}
5151
start args: '--addons ingress --memory 4096 --cpus 2'

‎.github/workflows/pushimge-next.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Setup Go environment
4242
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
4343
with:
44-
go-version: 1.13
44+
go-version: 1.21
4545
- name: Set up QEMU # Enables arm64 image building
4646
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3
4747
- name: Login to Quay

‎.github/workflows/validate-samples.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Install Go
4545
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
4646
with:
47-
go-version: "1.19"
47+
go-version: "1.21"
4848

4949
- name: Install Ginkgo
5050
run: go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.13.0

‎.github/workflows/validate-stacks.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Install Go
4747
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
4848
with:
49-
go-version: "1.19"
49+
go-version: "1.21"
5050

5151
- name: Install Ginkgo
5252
run: go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.13.0
@@ -161,7 +161,7 @@ jobs:
161161
- name: Install Go
162162
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
163163
with:
164-
go-version: "1.19"
164+
go-version: "1.21"
165165

166166
- name: Install odo latest version
167167
run: |

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The public registry is updated weekly, by 12pm EST Wednesdays, with any updated
66

77
## Registry Status
88

9-
![Go](https://img.shields.io/badge/Go-1.19-blue)
9+
![Go](https://img.shields.io/badge/Go-1.21-blue)
1010
[![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)
1111
[![Renovate][1]][2]
1212

0 commit comments

Comments
 (0)