Skip to content

Commit e889d7b

Browse files
go 1.21
Signed-off-by: Michael Valdron <[email protected]>
1 parent eaba8b9 commit e889d7b

12 files changed

+85
-12
lines changed

.ci/Dockerfile

+1-1
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

+1-1
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

+4-1
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

+1-1
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:

README.md

+1-1
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

tests/README.md

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

tests/odov3/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/devfile/registry/tests/odov3
22

3-
go 1.19
3+
go 1.21
44

55
require (
66
github.com/devfile/api/v2 v2.2.2

tests/odov3/go.sum

+36
Large diffs are not rendered by default.

tests/odov3/odo_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ var stacksPath string
3939
var stackDirs string
4040

4141
func init() {
42-
rand.Seed(time.Now().UnixNano())
4342
flag.StringVar(&stacksPath, "stacksPath", "../../stacks", "The path to the directory containing the stacks")
4443
flag.StringVar(&stackDirs, "stackDirs", "", "The stacks to test as a string separated by spaces")
4544
}

tests/validate_devfile_schemas/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/devfile/registry/tests/validate_devfiles
22

3-
go 1.19
3+
go 1.21
44

55
require (
66
github.com/devfile/library/v2 v2.2.2

tests/validate_devfile_schemas/go.sum

+38
Large diffs are not rendered by default.

tests/validate_devfile_schemas/validate_devfile_schemas_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ package main
33
import (
44
"flag"
55
"fmt"
6-
"math/rand"
76
"path/filepath"
87
"strings"
98
"testing"
10-
"time"
119

1210
"github.com/devfile/library/v2/pkg/devfile"
1311
"github.com/devfile/library/v2/pkg/devfile/parser"
@@ -19,7 +17,6 @@ var stacksPath string
1917
var stackDirs string
2018

2119
func init() {
22-
rand.Seed(time.Now().UnixNano())
2320
flag.StringVar(&stacksPath, "stacksPath", "../../stacks", "The path to the directory containing the stacks")
2421
flag.StringVar(&stackDirs, "stackDirs", "", "The stacks to test as a string separated by spaces")
2522
}

0 commit comments

Comments
 (0)