Skip to content

Commit

Permalink
upgrade(go): use 1.20 (opendatahub-io#811)
Browse files Browse the repository at this point in the history
- test: remove math/rand with less support for crypto
- update(operator-sdk) to 1.31.0

Signed-off-by: Wen Zhou <[email protected]>
  • Loading branch information
zdtsw authored Apr 16, 2024
1 parent ef977c2 commit 45afe5f
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
ARG GOLANG_VERSION=1.19
ARG GOLANG_VERSION=1.20
ARG USE_LOCAL=false
ARG OVERWRITE_MANIFESTS=""

Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/toolbox.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.fedoraproject.org/fedora-toolbox:38

ARG GOLANG_VERSION=1.19
ARG GOLANG_VERSION=1.20
ARG OPERATOR_SDK_VERSION=1.24.1

ENV GOLANG_VERSION=$GOLANG_VERSION \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ YQ ?= $(LOCALBIN)/yq
## Tool Versions
KUSTOMIZE_VERSION ?= v3.8.7
CONTROLLER_GEN_VERSION ?= v0.9.2
OPERATOR_SDK_VERSION ?= v1.24.1
OPERATOR_SDK_VERSION ?= v1.31.0
GOLANGCI_LINT_VERSION ?= v1.54.0
YQ_VERSION ?= v4.12.2
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
Expand Down Expand Up @@ -331,7 +331,7 @@ catalog-build: opm ## Build a catalog image.
catalog-push: ## Push a catalog image.
$(MAKE) image-push IMG=$(CATALOG_IMG)

TOOLBOX_GOLANG_VERSION := 1.19
TOOLBOX_GOLANG_VERSION := 1.20
TOOLBOX_OPERATOR_SDK_VERSION := 1.24.1

# Generate a Toolbox container for locally testing changes easily
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/opendatahub-io/opendatahub-operator/v2

go 1.19
go 1.20

require (
github.com/ghodss/yaml v1.0.0
Expand Down
4 changes: 0 additions & 4 deletions pkg/cluster/cluster_operations_suite_int_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ package cluster_test

import (
"context"
"math/rand"
"testing"
"time"

v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -33,8 +31,6 @@ func TestClusterOperationsIntegration(t *testing.T) {
}

var _ = BeforeSuite(func() {
rand.Seed(time.Now().UTC().UnixNano())

ctx, cancel = context.WithCancel(context.TODO())

opts := zap.Options{Development: true}
Expand Down
3 changes: 0 additions & 3 deletions tests/integration/features/features_suite_int_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ package features_test
import (
"context"
"fmt"
"math/rand"
"path/filepath"
"testing"
"time"

ofapiv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
v1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -42,7 +40,6 @@ func TestFeaturesIntegration(t *testing.T) {
}

var _ = BeforeSuite(func() {
rand.Seed(time.Now().UTC().UnixNano())

ctx, cancel = context.WithCancel(context.TODO())

Expand Down

0 comments on commit 45afe5f

Please sign in to comment.