Skip to content

Commit b651ebb

Browse files
Paul EichlerPhilipp Kuntz
authored andcommitted
Update a8s components and manifests
The a8s components (PostgreSQL operator, backup-manager, servicebinding-controller) are updated to the latest versions, which includes conversion webhooks. As these conversion webhooks require configuration in the CRDs along with a Service and a Certificate, they have been added too.
1 parent 994a741 commit b651ebb

File tree

3 files changed

+74
-14
lines changed

3 files changed

+74
-14
lines changed

deploy/a8s/manifests/backup-manager.yaml

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,23 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5+
cert-manager.io/inject-ca-from: a8s-system/a8s-backup-serving-cert
56
controller-gen.kubebuilder.io/version: v0.4.1
67
creationTimestamp: null
78
name: backups.backups.anynines.com
89
spec:
10+
conversion:
11+
strategy: Webhook
12+
webhook:
13+
clientConfig:
14+
service:
15+
name: a8s-backup-webhook-service
16+
namespace: a8s-system
17+
path: /convert
18+
port: 443
19+
conversionReviewVersions:
20+
- v1
21+
- v1beta1
922
group: backups.anynines.com
1023
names:
1124
kind: Backup
@@ -166,8 +179,6 @@ spec:
166179
retries:
167180
description: Number of times the backup has been retried
168181
type: integer
169-
required:
170-
- conditions
171182
type: object
172183
required:
173184
- spec
@@ -326,8 +337,6 @@ spec:
326337
retries:
327338
description: Number of times the backup has been retried
328339
type: integer
329-
required:
330-
- conditions
331340
type: object
332341
required:
333342
- spec
@@ -347,10 +356,23 @@ apiVersion: apiextensions.k8s.io/v1
347356
kind: CustomResourceDefinition
348357
metadata:
349358
annotations:
359+
cert-manager.io/inject-ca-from: a8s-system/a8s-backup-serving-cert
350360
controller-gen.kubebuilder.io/version: v0.4.1
351361
creationTimestamp: null
352362
name: restores.backups.anynines.com
353363
spec:
364+
conversion:
365+
strategy: Webhook
366+
webhook:
367+
clientConfig:
368+
service:
369+
name: a8s-backup-webhook-service
370+
namespace: a8s-system
371+
path: /convert
372+
port: 443
373+
conversionReviewVersions:
374+
- v1
375+
- v1beta1
354376
group: backups.anynines.com
355377
names:
356378
kind: Restore
@@ -516,8 +538,6 @@ spec:
516538
description: RestoreID is the ID of the Restore; clients can use this
517539
to poll the status of the Restore at the Pod identified by `PodToHit`.
518540
type: string
519-
required:
520-
- conditions
521541
type: object
522542
type: object
523543
served: true
@@ -679,8 +699,6 @@ spec:
679699
description: RestoreID is the ID of the Restore; clients can use this
680700
to poll the status of the Restore at the Pod identified by `PodToHit`.
681701
type: string
682-
required:
683-
- conditions
684702
type: object
685703
type: object
686704
served: true
@@ -934,7 +952,9 @@ spec:
934952
protocol: TCP
935953
targetPort: 9443
936954
selector:
937-
control-plane: controller-manager
955+
app.kubernetes.io/component: controller-manager
956+
app.kubernetes.io/name: backup-manager
957+
app.kubernetes.io/part-of: a8s-backup
938958
---
939959
apiVersion: apps/v1
940960
kind: Deployment
@@ -976,7 +996,7 @@ spec:
976996
fieldPath: metadata.namespace
977997
- name: BACKUP_CREDENTIAL_PATH
978998
value: /etc/backup-store-secrets
979-
image: public.ecr.aws/w5n9a2g2/a9s-ds-for-k8s/dev/backup-manager:v0.34.0
999+
image: public.ecr.aws/w5n9a2g2/a9s-ds-for-k8s/dev/backup-manager:878e5ef789335feada36e27dd40733e281536aa2
9801000
livenessProbe:
9811001
httpGet:
9821002
path: /healthz

deploy/a8s/manifests/postgresql-operator.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,22 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5+
cert-manager.io/inject-ca-from: a8s-system/postgresql-serving-cert
56
controller-gen.kubebuilder.io/version: v0.4.1
67
creationTimestamp: null
78
name: postgresqls.postgresql.anynines.com
89
spec:
10+
conversion:
11+
strategy: Webhook
12+
webhook:
13+
clientConfig:
14+
service:
15+
name: postgresql-webhook-service
16+
namespace: a8s-system
17+
path: /convert
18+
conversionReviewVersions:
19+
- v1
20+
- v1beta1
921
group: postgresql.anynines.com
1022
names:
1123
kind: Postgresql
@@ -2890,7 +2902,7 @@ spec:
28902902
- --leader-elect
28912903
command:
28922904
- postgresql-operator
2893-
image: public.ecr.aws/w5n9a2g2/a9s-ds-for-k8s/dev/postgresql-operator:v0.46.0
2905+
image: public.ecr.aws/w5n9a2g2/a9s-ds-for-k8s/dev/postgresql-operator:4880de8355bac36308e2f6f4ec3f4273e42af7b1
28942906
livenessProbe:
28952907
httpGet:
28962908
path: /healthz

deploy/a8s/manifests/service-binding-controller.yaml

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,22 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.4.1
6+
cert-manager.io/inject-ca-from: a8s-system/service-binding-serving-cert
67
creationTimestamp: null
78
name: servicebindings.servicebindings.anynines.com
89
spec:
10+
conversion:
11+
strategy: Webhook
12+
webhook:
13+
clientConfig:
14+
service:
15+
name: service-binding-webhook-service
16+
namespace: a8s-system
17+
path: /convert
18+
port: 443
19+
conversionReviewVersions:
20+
- v1
21+
- v1beta1
922
group: servicebindings.anynines.com
1023
names:
1124
categories:
@@ -395,6 +408,21 @@ spec:
395408
app.kubernetes.io/name: service-binding-controller-manager
396409
app.kubernetes.io/part-of: a8s-service-binding
397410
---
411+
apiVersion: v1
412+
kind: Service
413+
metadata:
414+
name: service-binding-webhook-service
415+
namespace: a8s-system
416+
spec:
417+
ports:
418+
- port: 443
419+
protocol: TCP
420+
targetPort: 9443
421+
selector:
422+
app.kubernetes.io/component: controller-manager
423+
app.kubernetes.io/name: service-binding-controller-manager
424+
app.kubernetes.io/part-of: a8s-service-binding
425+
---
398426
apiVersion: apps/v1
399427
kind: Deployment
400428
metadata:
@@ -428,7 +456,7 @@ spec:
428456
- a8s-service-binding-controller
429457
- --postgresql-root-role=a9s_user
430458
- --postgresql-default-database=a9s_apps_default_db
431-
image: public.ecr.aws/w5n9a2g2/a9s-ds-for-k8s/dev/service-binding-controller:v0.29.0
459+
image: public.ecr.aws/w5n9a2g2/a9s-ds-for-k8s/dev/service-binding-controller:7c91f7c206308935f6e9e576c71d032c53560fa1
432460
livenessProbe:
433461
httpGet:
434462
path: /healthz
@@ -492,8 +520,8 @@ metadata:
492520
namespace: a8s-system
493521
spec:
494522
dnsNames:
495-
- $(SERVICE_NAME).$(SERVICE_NAMESPACE).svc
496-
- $(SERVICE_NAME).$(SERVICE_NAMESPACE).svc.cluster.local
523+
- service-binding-webhook-service.a8s-system.svc
524+
- service-binding-webhook-service.a8s-system.svc.cluster.local
497525
issuerRef:
498526
kind: Issuer
499527
name: service-binding-selfsigned-issuer

0 commit comments

Comments
 (0)