Skip to content

Commit 019b0b4

Browse files
authored
Upgrade to Operator SDK 1.9.0 and Go 1.16 (#483)
1 parent 60f3ced commit 019b0b4

33 files changed

+292
-537
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- name: Set up Go
8080
uses: actions/setup-go@v2
8181
with:
82-
go-version: 1.15.x
82+
go-version: 1.16.x
8383

8484
- name: Start KinD Cluster
8585
# Start a KinD K8s cluster with single worker node

.github/workflows/coherence-matrix.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
- name: Set up Go
116116
uses: actions/setup-go@v2
117117
with:
118-
go-version: 1.15.x
118+
go-version: 1.16.x
119119

120120
- name: Start KinD Cluster
121121
shell: bash

.github/workflows/compatibility-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
- name: Set up Go
8787
uses: actions/setup-go@v2
8888
with:
89-
go-version: 1.15.x
89+
go-version: 1.16.x
9090

9191
- name: Start KinD Cluster
9292
# Start a KinD K8s cluster with single worker node

.github/workflows/k8s-matrix.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
- name: Set up Go
9292
uses: actions/setup-go@v2
9393
with:
94-
go-version: 1.15.x
94+
go-version: 1.16.x
9595

9696
- name: Start KinD Cluster
9797
shell: bash

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Set up Go
4444
uses: actions/setup-go@v2
4545
with:
46-
go-version: 1.15.x
46+
go-version: 1.16.x
4747

4848
- name: Start KinD Cluster
4949
shell: bash

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ test/**/test-report.xml
4040
/hack/sdk/*
4141

4242
# Generated file created by the build
43-
/pkg/data/zz_generated_assets.go
43+
bundle.Dockerfile
4444
/__debug_bin
4545
/istio-1.9.2/
4646
/java/certs/

Makefile

Lines changed: 177 additions & 180 deletions
Large diffs are not rendered by default.

api/v1/coherenceresource_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ func ensureV1CRDs(logger logr.Logger, scheme *runtime.Scheme, cl client.Client,
408408

409409
// ensureV1CRD ensures that the specified V1 CRD is loaded using the specified embedded CRD file
410410
func ensureV1CRD(logger logr.Logger, cl client.Client, fileName string) error {
411-
f, err := data.Assets.Open(fileName)
411+
f, err := data.Assets.Open("assets/" + fileName)
412412
if err != nil {
413413
return errors.Wrap(err, "opening embedded CRD asset "+fileName)
414414
}

bundle.Dockerfile

Lines changed: 0 additions & 21 deletions
This file was deleted.

config/default/kustomization.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,8 @@ vars:
2727
kind: Service
2828
version: v1
2929
name: webhook
30+
- name: WEBHOOK_SECRET_NAME
31+
objref:
32+
kind: Secret
33+
version: v1
34+
name: coherence-webhook-server-cert

0 commit comments

Comments
 (0)