diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9d05a1bd..0c7026f4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Check out source code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: gh_pages - uses: actions/setup-node@v2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b0639690..7ce0bff7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,14 +15,15 @@ jobs: - name: Display build environment run: printenv - - uses: actions/setup-go@v3 - name: Set up Go 1.x - with: - go-version: "1.20" - - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 name: Checkout frontend-operator + - uses: actions/setup-go@v5 + name: Set up Go 1.x + with: + go-version-file: 'go.mod' + check-latest: false + - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index f15907d7..4ca3052b 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -7,14 +7,15 @@ name: Run Unit Tests jobs: testing: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v2 - name: Set up golang 1.20 - with: - go-version: '1.20' - name: Check out source code - uses: actions/checkout@v2 + uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + name: Set up golang 1.2x + with: + go-version-file: 'go.mod' + check-latest: false - name: Install package and dependencies run: | make diff --git a/.tekton/frontend-operator-pull-request.yaml b/.tekton/frontend-operator-pull-request.yaml index 7f87e6a1..3409607f 100644 --- a/.tekton/frontend-operator-pull-request.yaml +++ b/.tekton/frontend-operator-pull-request.yaml @@ -207,7 +207,7 @@ spec: - name: TEST_OUTPUT description: Test output steps: - - image: registry.access.redhat.com/ubi8/go-toolset:1.20.12-5.1712568462 + - image: registry.access.redhat.com/ubi8/go-toolset:1.21 env: - name: SNAPSHOT value: $(params.SNAPSHOT) diff --git a/Dockerfile b/Dockerfile index 47c62ce6..df052686 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM registry.access.redhat.com/ubi8/go-toolset:1.20.12-5.1713833129 as base +FROM registry.access.redhat.com/ubi8/go-toolset:1.21 as base WORKDIR /workspace diff --git a/Makefile b/Makefile index 7e52dff3..ccf2e4d8 100644 --- a/Makefile +++ b/Makefile @@ -166,7 +166,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi CONTROLLER_GEN = $(shell pwd)/testbin/bin/controller-gen controller-gen: ## Download controller-gen locally if necessary. - $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0) + $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0) KUSTOMIZE = $(shell pwd)/testbin/bin/kustomize kustomize: ## Download kustomize locally if necessary. diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index fb59aa44..12f4ba7c 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2021 RedHatInsights. diff --git a/go.mod b/go.mod index 539e58b2..89a860dd 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/RedHatInsights/frontend-operator -go 1.20 +go 1.21 require ( github.com/RedHatInsights/clowder v0.80.0