Skip to content

Commit

Permalink
Update controller gen
Browse files Browse the repository at this point in the history
  • Loading branch information
Hyperkid123 committed Jul 12, 2024
1 parent 805b688 commit c108449
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .tekton/frontend-operator-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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/RedHatInsights/frontend-operator

go 1.20
go 1.21

require (
github.com/RedHatInsights/clowder v0.80.0
Expand Down

0 comments on commit c108449

Please sign in to comment.