Skip to content

Commit

Permalink
Merge branch 'main' into edit-e2e-readme
Browse files Browse the repository at this point in the history
  • Loading branch information
dimakis authored Aug 10, 2023
2 parents 8f9d356 + 099be36 commit cf51846
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Set Go
uses: actions/setup-go@v3
with:
go-version: v1.18
go-version: v1.19

- name: Set up gotestfmt
uses: gotesttools/gotestfmt-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/olm_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Set Go
uses: actions/setup-go@v3
with:
go-version: v1.18
go-version: v1.19

- name: Set up gotestfmt
uses: gotesttools/gotestfmt-action@v2
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/operator-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set Go
uses: actions/setup-go@v3
with:
go-version: v1.19

- name: Install operator-sdk
run: |
export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac)
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set Go
uses: actions/setup-go@v3
with:
go-version: v1.19

- name: Activate cache
uses: actions/cache@v3
with:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/tag-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set Go
uses: actions/setup-go@v3
with:
go-version: v1.19

- name: Verify that release doesn't exist yet
shell: bash {0}
run: |
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set Go
uses: actions/setup-go@v3
with:
go-version: v1.19

- name: Activate cache
uses: actions/cache@v3
with:
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/verify_generated_files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,42 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set Go
uses: actions/setup-go@v3
with:
go-version: v1.19
- name: Verify that the DeepCopy, DeepCopyInto, and DeepCopyObject method implementations have been generated
run: make generate && git diff --exit-code

verify-generate-client:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set Go
uses: actions/setup-go@v3
with:
go-version: v1.19
- name: Verify that the latest client has been generated
run: make generate-client && git diff --exit-code

verify-imports:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set Go
uses: actions/setup-go@v3
with:
go-version: v1.19
- name: Verify that imports are organized
run: make verify-imports

verify-manifests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set Go
uses: actions/setup-go@v3
with:
go-version: v1.19
- name: Verify that the latest WebhookConfigurations, ClusterRoles, and CustomResourceDefinitions have been generated
run: make manifests && git diff --exit-code
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Here are a few things to go over before getting started with CodeFlare Operator
## Environment setup

The following should be installed in your working environment:
- Go 1.18.X
- Go 1.19.x
- [Download release](https://go.dev/dl/)
- [Install Instructions](https://go.dev/doc/install)
- [Operator SDK](https://sdk.operatorframework.io/docs/installation/)
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.18.9-8 as builder
FROM registry.access.redhat.com/ubi8/go-toolset:1.19.10-10 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 2 additions & 0 deletions OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ approvers:
- jbusche
- kpostoffice
- maxusmusti
- sutaakar
- tedhtchang
reviewers:
- anishasthana
Expand All @@ -13,4 +14,5 @@ reviewers:
- kpostoffice
- maxusmusti
- MichaelClifford
- sutaakar
- tedhtchang
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/project-codeflare/codeflare-operator

go 1.18
go 1.19

require (
github.com/go-logr/logr v1.2.4
Expand Down

0 comments on commit cf51846

Please sign in to comment.