Skip to content

Commit 2d93c34

Browse files
sroettgersroettger
authored
fix web deployments with AddToScheme for missing resources (#363)
* fix web deployments with AddToScheme for missing resources * make manifests * make all * Automated commit: update images. * undo some of the changes * Automated commit: update images.
1 parent ea2d63f commit 2d93c34

File tree

10 files changed

+133
-7
lines changed

10 files changed

+133
-7
lines changed

‎dist/resources/kctf-operator.clusterserviceversion.yaml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ metadata:
1414
}
1515
]
1616
capabilities: Basic Install
17-
operators.operatorframework.io/builder: operator-sdk-v1.14.0+git
17+
operators.operatorframework.io/builder: operator-sdk-v1.17.0+git
1818
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
1919
name: kctf-operator.v0.0.1
2020
namespace: placeholder
@@ -72,6 +72,18 @@ spec:
7272
- patch
7373
- update
7474
- watch
75+
- apiGroups:
76+
- cloud.google.com
77+
resources:
78+
- backendconfigs
79+
verbs:
80+
- create
81+
- delete
82+
- get
83+
- list
84+
- patch
85+
- update
86+
- watch
7587
- apiGroups:
7688
- ""
7789
resources:
@@ -206,6 +218,18 @@ spec:
206218
- get
207219
- patch
208220
- update
221+
- apiGroups:
222+
- networking.gke.io
223+
resources:
224+
- managedcertificates
225+
verbs:
226+
- create
227+
- delete
228+
- get
229+
- list
230+
- patch
231+
- update
232+
- watch
209233
- apiGroups:
210234
- networking.k8s.io
211235
resources:
@@ -304,6 +328,7 @@ spec:
304328
value: 0.0.0.0/0
305329
- name: SECURITY_POLICY
306330
value: kctf-policy
331+
307332
image: eu.gcr.io/kctf-testing/kctf-operator:dev
308333
livenessProbe:
309334
httpGet:

‎dist/resources/operator.yaml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4194,6 +4194,18 @@ rules:
41944194
- patch
41954195
- update
41964196
- watch
4197+
- apiGroups:
4198+
- cloud.google.com
4199+
resources:
4200+
- backendconfigs
4201+
verbs:
4202+
- create
4203+
- delete
4204+
- get
4205+
- list
4206+
- patch
4207+
- update
4208+
- watch
41974209
- apiGroups:
41984210
- ""
41994211
resources:
@@ -4328,6 +4340,18 @@ rules:
43284340
- get
43294341
- patch
43304342
- update
4343+
- apiGroups:
4344+
- networking.gke.io
4345+
resources:
4346+
- managedcertificates
4347+
verbs:
4348+
- create
4349+
- delete
4350+
- get
4351+
- list
4352+
- patch
4353+
- update
4354+
- watch
43314355
- apiGroups:
43324356
- networking.k8s.io
43334357
resources:
@@ -4520,7 +4544,7 @@ spec:
45204544
value: 0.0.0.0/0
45214545
- name: SECURITY_POLICY
45224546
value: DISABLED
4523-
image: gcr.io/kctf-docker/kctf-operator@sha256:44399c2da5c9ff858a858b7a0163bafc95517345ca94f24b3e782078e5bc4faf
4547+
image: gcr.io/kctf-docker/kctf-operator@sha256:12d5b1132b01434f0977e856cd700d98e18fdbfdaaa9959ad25335eb06e83d88
45244548
livenessProbe:
45254549
httpGet:
45264550
path: /healthz

‎kctf-operator/bundle.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=kctf-operator
88
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
9-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.14.0+git
9+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.17.0+git
1010
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1111
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
1212

‎kctf-operator/bundle/manifests/kctf-operator.clusterserviceversion.yaml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ metadata:
1414
}
1515
]
1616
capabilities: Basic Install
17-
operators.operatorframework.io/builder: operator-sdk-v1.14.0+git
17+
operators.operatorframework.io/builder: operator-sdk-v1.17.0+git
1818
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
1919
name: kctf-operator.v0.0.1
2020
namespace: placeholder
@@ -72,6 +72,18 @@ spec:
7272
- patch
7373
- update
7474
- watch
75+
- apiGroups:
76+
- cloud.google.com
77+
resources:
78+
- backendconfigs
79+
verbs:
80+
- create
81+
- delete
82+
- get
83+
- list
84+
- patch
85+
- update
86+
- watch
7587
- apiGroups:
7688
- ""
7789
resources:
@@ -206,6 +218,18 @@ spec:
206218
- get
207219
- patch
208220
- update
221+
- apiGroups:
222+
- networking.gke.io
223+
resources:
224+
- managedcertificates
225+
verbs:
226+
- create
227+
- delete
228+
- get
229+
- list
230+
- patch
231+
- update
232+
- watch
209233
- apiGroups:
210234
- networking.k8s.io
211235
resources:

‎kctf-operator/bundle/metadata/annotations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ annotations:
55
operators.operatorframework.io.bundle.metadata.v1: metadata/
66
operators.operatorframework.io.bundle.package.v1: kctf-operator
77
operators.operatorframework.io.bundle.channels.v1: alpha
8-
operators.operatorframework.io.metrics.builder: operator-sdk-v1.14.0+git
8+
operators.operatorframework.io.metrics.builder: operator-sdk-v1.17.0+git
99
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1010
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
1111

‎kctf-operator/config/rbac/role.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,18 @@ rules:
4242
- patch
4343
- update
4444
- watch
45+
- apiGroups:
46+
- cloud.google.com
47+
resources:
48+
- backendconfigs
49+
verbs:
50+
- create
51+
- delete
52+
- get
53+
- list
54+
- patch
55+
- update
56+
- watch
4557
- apiGroups:
4658
- ""
4759
resources:
@@ -176,6 +188,18 @@ rules:
176188
- get
177189
- patch
178190
- update
191+
- apiGroups:
192+
- networking.gke.io
193+
resources:
194+
- managedcertificates
195+
verbs:
196+
- create
197+
- delete
198+
- get
199+
- list
200+
- patch
201+
- update
202+
- watch
179203
- apiGroups:
180204
- networking.k8s.io
181205
resources:

‎kctf-operator/controllers/challenge_controller.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ type ChallengeReconciler struct {
7373
//+kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses,verbs=get;list;watch;create;update;patch;delete
7474
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles,verbs=get;list;watch;create;update;patch;delete
7575
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterrolebindings,verbs=get;list;watch;create;update;patch;delete
76+
//+kubebuilder:rbac:groups=cloud.google.com,resources=backendconfigs,verbs=get;list;watch;create;update;patch;delete
77+
//+kubebuilder:rbac:groups=networking.gke.io,resources=managedcertificates,verbs=get;list;watch;create;update;patch;delete
7678

7779
// Reconcile is part of the main kubernetes reconciliation loop which aims to
7880
// move the current state of the cluster closer to the desired state.

‎kctf-operator/controllers/service/service.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ func generateBackendConfig(challenge *kctfv1.Challenge) *backendv1.BackendConfig
7070
Name: challenge.Name,
7171
Namespace: challenge.Namespace,
7272
},
73-
Spec: backendv1.BackendConfigSpec{
74-
},
73+
Spec: backendv1.BackendConfigSpec{},
7574
}
7675
if os.Getenv("SECURITY_POLICY") != "DISABLED" {
7776
config.Spec.SecurityPolicy = &backendv1.SecurityPolicyConfig{

‎kctf-operator/main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ import (
2424
// to ensure that exec-entrypoint and run can make use of them.
2525
_ "k8s.io/client-go/plugin/pkg/client/auth"
2626

27+
gkenetv1 "github.com/GoogleCloudPlatform/gke-managed-certs/pkg/apis/networking.gke.io/v1"
2728
"k8s.io/apimachinery/pkg/runtime"
2829
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2930
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
31+
backendv1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1"
3032
ctrl "sigs.k8s.io/controller-runtime"
3133
"sigs.k8s.io/controller-runtime/pkg/healthz"
3234
"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -47,6 +49,8 @@ func init() {
4749
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
4850

4951
utilruntime.Must(kctfv1.AddToScheme(scheme))
52+
utilruntime.Must(backendv1.AddToScheme(scheme))
53+
utilruntime.Must(gkenetv1.AddToScheme(scheme))
5054
//+kubebuilder:scaffold:scheme
5155
}
5256

‎kctf-operator/operator.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4194,6 +4194,18 @@ rules:
41944194
- patch
41954195
- update
41964196
- watch
4197+
- apiGroups:
4198+
- cloud.google.com
4199+
resources:
4200+
- backendconfigs
4201+
verbs:
4202+
- create
4203+
- delete
4204+
- get
4205+
- list
4206+
- patch
4207+
- update
4208+
- watch
41974209
- apiGroups:
41984210
- ""
41994211
resources:
@@ -4328,6 +4340,18 @@ rules:
43284340
- get
43294341
- patch
43304342
- update
4343+
- apiGroups:
4344+
- networking.gke.io
4345+
resources:
4346+
- managedcertificates
4347+
verbs:
4348+
- create
4349+
- delete
4350+
- get
4351+
- list
4352+
- patch
4353+
- update
4354+
- watch
43314355
- apiGroups:
43324356
- networking.k8s.io
43334357
resources:

0 commit comments

Comments
 (0)