Skip to content

Commit b8c5165

Browse files
authored
Merge pull request #21 from davidebianchi/fix/RHOAIENG-63293
fix: sync manifests with rhods-operator rhoai-3.5-ea.1 branch and fix…
2 parents 2f6a53f + 2960b13 commit b8c5165

22 files changed

Lines changed: 1395 additions & 251 deletions

charts/dependencies/cert-manager-operator/test/snapshots/default.snap.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ apiVersion: v1
1010
kind: Namespace
1111
metadata:
1212
name: cert-manager
13+
1314
---
1415
# Source: cert-manager-operator/templates/serviceaccount-cert-manager-operator-controller-manager.yaml
1516
apiVersion: v1
@@ -19,6 +20,7 @@ metadata:
1920
namespace: cert-manager-operator
2021
imagePullSecrets:
2122
- name: rhai-pull-secret
23+
2224
---
2325
# Source: cert-manager-operator/templates/serviceaccount-cert-manager.yaml
2426
apiVersion: v1
@@ -46,6 +48,7 @@ metadata:
4648
namespace: cert-manager
4749
imagePullSecrets:
4850
- name: rhai-pull-secret
51+
4952
---
5053
# Source: cert-manager-operator/templates/clusterrole-cert-manager-operator-controller-manager-clusterro.yaml
5154
apiVersion: rbac.authorization.k8s.io/v1
@@ -336,6 +339,7 @@ rules:
336339
- subjectaccessreviews
337340
verbs:
338341
- create
342+
339343
---
340344
# Source: cert-manager-operator/templates/clusterrole-cert-manager-operator-metrics-reader.yaml
341345
apiVersion: rbac.authorization.k8s.io/v1
@@ -353,6 +357,7 @@ rules:
353357
- /metrics
354358
verbs:
355359
- get
360+
356361
---
357362
# Source: cert-manager-operator/templates/clusterrolebinding-cert-manager-operator-controller-manager-clusterro.yaml
358363
apiVersion: rbac.authorization.k8s.io/v1
@@ -368,6 +373,7 @@ subjects:
368373
- kind: ServiceAccount
369374
name: cert-manager-operator-controller-manager
370375
namespace: cert-manager-operator
376+
371377
---
372378
# Source: cert-manager-operator/templates/role-cert-manager-operator-controller-manager-role.yaml
373379
apiVersion: rbac.authorization.k8s.io/v1
@@ -407,6 +413,7 @@ rules:
407413
verbs:
408414
- create
409415
- patch
416+
410417
---
411418
# Source: cert-manager-operator/templates/rolebinding-cert-manager-operator-controller-manager-rolebindi.yaml
412419
apiVersion: rbac.authorization.k8s.io/v1
@@ -422,6 +429,7 @@ subjects:
422429
- kind: ServiceAccount
423430
name: cert-manager-operator-controller-manager
424431
namespace: cert-manager-operator
432+
425433
---
426434
# Source: cert-manager-operator/templates/service-cert-manager-operator-controller-manager-metrics-s.yaml
427435
apiVersion: v1
@@ -444,6 +452,7 @@ spec:
444452
targetPort: https
445453
selector:
446454
control-plane: controller-manager
455+
447456
---
448457
# Source: cert-manager-operator/templates/deployment-cert-manager-operator-controller-manager.yaml
449458
apiVersion: apps/v1
@@ -559,6 +568,7 @@ spec:
559568
volumes:
560569
- emptyDir: {}
561570
name: tmp
571+
562572
---
563573
# Source: cert-manager-operator/templates/certmanager.yaml
564574
apiVersion: operator.openshift.io/v1alpha1

charts/dependencies/gateway-api/test/snapshots/default.snap.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,6 +1318,7 @@ status:
13181318
plural: ""
13191319
conditions: null
13201320
storedVersions: null
1321+
13211322
---
13221323
# Source: gateway-api/templates/gateway.networking.k8s.io_gatewayclasses.yaml
13231324
apiVersion: apiextensions.k8s.io/v1
@@ -1835,6 +1836,7 @@ status:
18351836
plural: ""
18361837
conditions: null
18371838
storedVersions: null
1839+
18381840
---
18391841
# Source: gateway-api/templates/gateway.networking.k8s.io_gateways.yaml
18401842
apiVersion: apiextensions.k8s.io/v1
@@ -4090,6 +4092,7 @@ status:
40904092
plural: ""
40914093
conditions: null
40924094
storedVersions: null
4095+
40934096
---
40944097
# Source: gateway-api/templates/gateway.networking.k8s.io_grpcroutes.yaml
40954098
apiVersion: apiextensions.k8s.io/v1
@@ -6162,6 +6165,7 @@ status:
61626165
plural: ""
61636166
conditions: null
61646167
storedVersions: null
6168+
61656169
---
61666170
# Source: gateway-api/templates/gateway.networking.k8s.io_httproutes.yaml
61676171
apiVersion: apiextensions.k8s.io/v1
@@ -11807,6 +11811,7 @@ status:
1180711811
plural: ""
1180811812
conditions: null
1180911813
storedVersions: null
11814+
1181011815
---
1181111816
# Source: gateway-api/templates/gateway.networking.k8s.io_referencegrants.yaml
1181211817
apiVersion: apiextensions.k8s.io/v1

charts/dependencies/lws-operator/test/snapshots/default.snap.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: v1
44
kind: Namespace
55
metadata:
66
name: openshift-lws-operator
7+
78
---
89
# Source: lws-operator/templates/serviceaccount-lws-controller.yaml
910
apiVersion: v1
@@ -13,6 +14,7 @@ metadata:
1314
namespace: openshift-lws-operator
1415
imagePullSecrets:
1516
- name: rhai-pull-secret
17+
1618
---
1719
# Source: lws-operator/templates/serviceaccount-openshift-lws-operator.yaml
1820
apiVersion: v1
@@ -22,6 +24,7 @@ metadata:
2224
namespace: openshift-lws-operator
2325
imagePullSecrets:
2426
- name: rhai-pull-secret
27+
2528
---
2629
# Source: lws-operator/templates/clusterrole-openshift-lws-operator-clusterrole.yaml
2730
apiVersion: rbac.authorization.k8s.io/v1
@@ -213,6 +216,7 @@ rules:
213216
- patch
214217
- update
215218
- watch
219+
216220
---
217221
# Source: lws-operator/templates/clusterrolebinding-openshift-lws-operator-clusterrolebinding.yaml
218222
apiVersion: rbac.authorization.k8s.io/v1
@@ -228,6 +232,7 @@ subjects:
228232
- kind: ServiceAccount
229233
name: openshift-lws-operator
230234
namespace: openshift-lws-operator
235+
231236
---
232237
# Source: lws-operator/templates/role-openshift-lws-operator-role.yaml
233238
apiVersion: rbac.authorization.k8s.io/v1
@@ -359,6 +364,7 @@ rules:
359364
- list
360365
- patch
361366
- update
367+
362368
---
363369
# Source: lws-operator/templates/kube-system-role-binding.yaml
364370
apiVersion: rbac.authorization.k8s.io/v1
@@ -374,6 +380,7 @@ subjects:
374380
- kind: ServiceAccount
375381
name: openshift-lws-operator
376382
namespace: openshift-lws-operator
383+
377384
---
378385
# Source: lws-operator/templates/rolebinding-openshift-lws-operator-rolebinding.yaml
379386
apiVersion: rbac.authorization.k8s.io/v1
@@ -389,6 +396,7 @@ subjects:
389396
- kind: ServiceAccount
390397
name: openshift-lws-operator
391398
namespace: openshift-lws-operator
399+
392400
---
393401
# Source: lws-operator/templates/deployment-openshift-lws-operator.yaml
394402
apiVersion: apps/v1
@@ -440,6 +448,7 @@ spec:
440448
volumes:
441449
- emptyDir: {}
442450
name: tmp
451+
443452
---
444453
# Source: lws-operator/templates/leaderworkersetoperator.yaml
445454
apiVersion: operator.openshift.io/v1

charts/dependencies/sail-operator/test/snapshots/default.snap.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: v1
44
kind: Namespace
55
metadata:
66
name: istio-system
7+
78
---
89
# Source: sail-operator/templates/serviceaccount-servicemesh-operator3.yaml
910
apiVersion: v1
@@ -13,6 +14,7 @@ metadata:
1314
namespace: istio-system
1415
imagePullSecrets:
1516
- name: rhai-pull-secret
17+
1618
---
1719
# Source: sail-operator/templates/clusterrole-metrics-reader.yaml
1820
apiVersion: rbac.authorization.k8s.io/v1
@@ -31,6 +33,7 @@ rules:
3133
- /metrics
3234
verbs:
3335
- get
36+
3437
---
3538
# Source: sail-operator/templates/clusterrole-servicemesh-operator3-clusterrole.yaml
3639
apiVersion: rbac.authorization.k8s.io/v1
@@ -296,6 +299,7 @@ rules:
296299
- get
297300
- patch
298301
- update
302+
299303
---
300304
# Source: sail-operator/templates/clusterrolebinding-servicemesh-operator3-clusterrolebinding.yaml
301305
apiVersion: rbac.authorization.k8s.io/v1
@@ -311,6 +315,7 @@ subjects:
311315
- kind: ServiceAccount
312316
name: servicemesh-operator3
313317
namespace: istio-system
318+
314319
---
315320
# Source: sail-operator/templates/role-servicemesh-operator3-role.yaml
316321
apiVersion: rbac.authorization.k8s.io/v1
@@ -350,6 +355,7 @@ rules:
350355
verbs:
351356
- create
352357
- patch
358+
353359
---
354360
# Source: sail-operator/templates/rolebinding-servicemesh-operator3-rolebinding.yaml
355361
apiVersion: rbac.authorization.k8s.io/v1
@@ -365,6 +371,7 @@ subjects:
365371
- kind: ServiceAccount
366372
name: servicemesh-operator3
367373
namespace: istio-system
374+
368375
---
369376
# Source: sail-operator/templates/service-servicemesh-operator3-metrics-service.yaml
370377
apiVersion: v1
@@ -389,6 +396,7 @@ spec:
389396
targetPort: 8443
390397
selector:
391398
control-plane: servicemesh-operator3
399+
392400
---
393401
# Source: sail-operator/templates/deployment-servicemesh-operator3.yaml
394402
apiVersion: apps/v1
@@ -544,6 +552,7 @@ spec:
544552
fieldPath: metadata.annotations
545553
path: config.properties
546554
name: operator-config
555+
547556
---
548557
# Source: sail-operator/templates/istio.yaml
549558
apiVersion: sailoperator.io/v1

0 commit comments

Comments
 (0)