Skip to content

Commit e368bbc

Browse files
teoincontattoteoincontatto
committed
fix: wrong original SGStream service path in webhooks, avoid setting caBundle in webhooks, follow webhooks original ordering, avoid usage of nullable in CRDs
1 parent 7d75468 commit e368bbc

5 files changed

Lines changed: 99 additions & 134 deletions

File tree

‎stackgres-k8s/install/helm/stackgres-operator/templates/mutating-webhook-configuration.yaml‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
{{- $cert := "Cg==" }}
2-
{{- $certSecret := lookup "v1" "Secret" .Release.Namespace (include "cert-name" .) }}
3-
{{- if $certSecret }}
4-
{{- if (index $certSecret.data "tls.crt") }}
5-
{{- $cert = (index $certSecret.data "tls.crt") }}
6-
{{- end }}
7-
{{- end }}
81
apiVersion: admissionregistration.k8s.io/v1
92
kind: MutatingWebhookConfiguration
103
metadata:
@@ -32,7 +25,6 @@ webhooks:
3225
namespace: {{ .Release.Namespace }}
3326
name: {{ .Release.Name }}
3427
path: '/stackgres/mutation/sgcluster'
35-
caBundle: {{ $cert }}
3628
admissionReviewVersions: ["v1"]
3729
{{- if .Values.allowedNamespaces }}
3830
namespaceSelector:
@@ -56,7 +48,6 @@ webhooks:
5648
namespace: {{ .Release.Namespace }}
5749
name: {{ .Release.Name }}
5850
path: '/stackgres/mutation/sgpgconfig'
59-
caBundle: {{ $cert }}
6051
admissionReviewVersions: ["v1"]
6152
{{- if .Values.allowedNamespaces }}
6253
namespaceSelector:
@@ -80,7 +71,6 @@ webhooks:
8071
namespace: {{ .Release.Namespace }}
8172
name: {{ .Release.Name }}
8273
path: '/stackgres/mutation/sgpoolconfig'
83-
caBundle: {{ $cert }}
8474
admissionReviewVersions: ["v1"]
8575
{{- if .Values.allowedNamespaces }}
8676
namespaceSelector:
@@ -104,7 +94,6 @@ webhooks:
10494
namespace: {{ .Release.Namespace }}
10595
name: {{ .Release.Name }}
10696
path: '/stackgres/mutation/sginstanceprofile'
107-
caBundle: {{ $cert }}
10897
admissionReviewVersions: ["v1"]
10998
{{- if .Values.allowedNamespaces }}
11099
namespaceSelector:
@@ -128,7 +117,6 @@ webhooks:
128117
namespace: {{ .Release.Namespace }}
129118
name: {{ .Release.Name }}
130119
path: '/stackgres/mutation/sgbackupconfig'
131-
caBundle: {{ $cert }}
132120
admissionReviewVersions: ["v1"]
133121
{{- if .Values.allowedNamespaces }}
134122
namespaceSelector:
@@ -152,7 +140,6 @@ webhooks:
152140
namespace: {{ .Release.Namespace }}
153141
name: {{ .Release.Name }}
154142
path: '/stackgres/mutation/sgbackup'
155-
caBundle: {{ $cert }}
156143
admissionReviewVersions: ["v1"]
157144
{{- if .Values.allowedNamespaces }}
158145
namespaceSelector:
@@ -176,7 +163,6 @@ webhooks:
176163
namespace: {{ .Release.Namespace }}
177164
name: {{ .Release.Name }}
178165
path: '/stackgres/mutation/sgdistributedlogs'
179-
caBundle: {{ $cert }}
180166
admissionReviewVersions: ["v1"]
181167
{{- if .Values.allowedNamespaces }}
182168
namespaceSelector:
@@ -200,7 +186,6 @@ webhooks:
200186
namespace: {{ .Release.Namespace }}
201187
name: {{ .Release.Name }}
202188
path: '/stackgres/mutation/sgdbops'
203-
caBundle: {{ $cert }}
204189
admissionReviewVersions: ["v1"]
205190
{{- if .Values.allowedNamespaces }}
206191
namespaceSelector:
@@ -224,7 +209,6 @@ webhooks:
224209
namespace: {{ .Release.Namespace }}
225210
name: {{ .Release.Name }}
226211
path: '/stackgres/mutation/sgobjectstorage'
227-
caBundle: {{ $cert }}
228212
admissionReviewVersions: ["v1"]
229213
{{- if .Values.allowedNamespaces }}
230214
namespaceSelector:
@@ -235,7 +219,7 @@ webhooks:
235219
matchLabels:
236220
{{ toYaml .Values.allowedNamespaceLabelSelector | nindent 8 }}
237221
{{- end }}
238-
- name: sgscripts.mutating-webhook.stackgres.io
222+
- name: sgscript.mutating-webhook.stackgres.io
239223
sideEffects: None
240224
rules:
241225
- operations: ["CREATE", "UPDATE"]
@@ -248,7 +232,6 @@ webhooks:
248232
namespace: {{ .Release.Namespace }}
249233
name: {{ .Release.Name }}
250234
path: '/stackgres/mutation/sgscript'
251-
caBundle: {{ $cert }}
252235
admissionReviewVersions: ["v1"]
253236
{{- if .Values.allowedNamespaces }}
254237
namespaceSelector:
@@ -259,7 +242,7 @@ webhooks:
259242
matchLabels:
260243
{{ toYaml .Values.allowedNamespaceLabelSelector | nindent 8 }}
261244
{{- end }}
262-
- name: sgshardedclusters.mutating-webhook.stackgres.io
245+
- name: sgshardedcluster.mutating-webhook.stackgres.io
263246
sideEffects: None
264247
rules:
265248
- operations: ["CREATE", "UPDATE"]
@@ -272,7 +255,6 @@ webhooks:
272255
namespace: {{ .Release.Namespace }}
273256
name: {{ .Release.Name }}
274257
path: '/stackgres/mutation/sgshardedcluster'
275-
caBundle: {{ $cert }}
276258
admissionReviewVersions: ["v1"]
277259
{{- if .Values.allowedNamespaces }}
278260
namespaceSelector:
@@ -283,7 +265,7 @@ webhooks:
283265
matchLabels:
284266
{{ toYaml .Values.allowedNamespaceLabelSelector | nindent 8 }}
285267
{{- end }}
286-
- name: sgshardedbackups.mutating-webhook.stackgres.io
268+
- name: sgshardedbackup.mutating-webhook.stackgres.io
287269
sideEffects: None
288270
rules:
289271
- operations: ["CREATE", "UPDATE"]
@@ -296,7 +278,6 @@ webhooks:
296278
namespace: {{ .Release.Namespace }}
297279
name: {{ .Release.Name }}
298280
path: '/stackgres/mutation/sgshardedbackup'
299-
caBundle: {{ $cert }}
300281
admissionReviewVersions: ["v1"]
301282
{{- if .Values.allowedNamespaces }}
302283
namespaceSelector:
@@ -320,7 +301,6 @@ webhooks:
320301
namespace: {{ .Release.Namespace }}
321302
name: {{ .Release.Name }}
322303
path: '/stackgres/mutation/sgshardeddbops'
323-
caBundle: {{ $cert }}
324304
admissionReviewVersions: ["v1"]
325305
{{- if .Values.allowedNamespaces }}
326306
namespaceSelector:
@@ -331,7 +311,7 @@ webhooks:
331311
matchLabels:
332312
{{ toYaml .Values.allowedNamespaceLabelSelector | nindent 8 }}
333313
{{- end }}
334-
- name: sgstreams.mutating-webhook.stackgres.io
314+
- name: sgstream.mutating-webhook.stackgres.io
335315
sideEffects: None
336316
rules:
337317
- operations: ["CREATE", "UPDATE"]
@@ -343,8 +323,7 @@ webhooks:
343323
service:
344324
namespace: {{ .Release.Namespace }}
345325
name: {{ .Release.Name }}
346-
path: '/stackgres/mutation/sgstreams'
347-
caBundle: {{ $cert }}
326+
path: '/stackgres/mutation/sgstream'
348327
admissionReviewVersions: ["v1"]
349328
{{- if .Values.allowedNamespaces }}
350329
namespaceSelector:
@@ -355,4 +334,4 @@ webhooks:
355334
matchLabels:
356335
{{ toYaml .Values.allowedNamespaceLabelSelector | nindent 8 }}
357336
{{- end }}
358-
337+

‎stackgres-k8s/install/helm/stackgres-operator/templates/validating-webhook-configuration.yaml‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
{{- $cert := "Cg==" }}
2-
{{- $certSecret := lookup "v1" "Secret" .Release.Namespace (include "cert-name" .) }}
3-
{{- if $certSecret }}
4-
{{- if (index ($certSecret.data) "tls.crt") }}
5-
{{- $cert = (index $certSecret.data "tls.crt") }}
6-
{{- end }}
7-
{{- end }}
81
apiVersion: admissionregistration.k8s.io/v1
92
kind: ValidatingWebhookConfiguration
103
metadata:
@@ -32,7 +25,6 @@ webhooks:
3225
namespace: {{ .Release.Namespace }}
3326
name: {{ .Release.Name }}
3427
path: '/stackgres/validation/sgcluster'
35-
caBundle: {{ $cert }}
3628
admissionReviewVersions: ["v1"]
3729
{{- if .Values.allowedNamespaces }}
3830
namespaceSelector:
@@ -56,7 +48,6 @@ webhooks:
5648
namespace: {{ .Release.Namespace }}
5749
name: {{ .Release.Name }}
5850
path: '/stackgres/validation/sgpgconfig'
59-
caBundle: {{ $cert }}
6051
admissionReviewVersions: ["v1"]
6152
{{- if .Values.allowedNamespaces }}
6253
namespaceSelector:
@@ -80,7 +71,6 @@ webhooks:
8071
namespace: {{ .Release.Namespace }}
8172
name: {{ .Release.Name }}
8273
path: '/stackgres/validation/sgpoolconfig'
83-
caBundle: {{ $cert }}
8474
admissionReviewVersions: ["v1"]
8575
{{- if .Values.allowedNamespaces }}
8676
namespaceSelector:
@@ -104,7 +94,6 @@ webhooks:
10494
namespace: {{ .Release.Namespace }}
10595
name: {{ .Release.Name }}
10696
path: '/stackgres/validation/sginstanceprofile'
107-
caBundle: {{ $cert }}
10897
admissionReviewVersions: ["v1"]
10998
{{- if .Values.allowedNamespaces }}
11099
namespaceSelector:
@@ -128,7 +117,6 @@ webhooks:
128117
namespace: {{ .Release.Namespace }}
129118
name: {{ .Release.Name }}
130119
path: '/stackgres/validation/sgbackupconfig'
131-
caBundle: {{ $cert }}
132120
admissionReviewVersions: ["v1"]
133121
{{- if .Values.allowedNamespaces }}
134122
namespaceSelector:
@@ -152,7 +140,6 @@ webhooks:
152140
namespace: {{ .Release.Namespace }}
153141
name: {{ .Release.Name }}
154142
path: '/stackgres/validation/sgbackup'
155-
caBundle: {{ $cert }}
156143
admissionReviewVersions: ["v1"]
157144
{{- if .Values.allowedNamespaces }}
158145
namespaceSelector:
@@ -176,7 +163,6 @@ webhooks:
176163
namespace: {{ .Release.Namespace }}
177164
name: {{ .Release.Name }}
178165
path: '/stackgres/validation/sgdistributedlogs'
179-
caBundle: {{ $cert }}
180166
admissionReviewVersions: ["v1"]
181167
{{- if .Values.allowedNamespaces }}
182168
namespaceSelector:
@@ -200,7 +186,6 @@ webhooks:
200186
namespace: {{ .Release.Namespace }}
201187
name: {{ .Release.Name }}
202188
path: '/stackgres/validation/sgdbops'
203-
caBundle: {{ $cert }}
204189
admissionReviewVersions: ["v1"]
205190
{{- if .Values.allowedNamespaces }}
206191
namespaceSelector:
@@ -224,7 +209,6 @@ webhooks:
224209
namespace: {{ .Release.Namespace }}
225210
name: {{ .Release.Name }}
226211
path: '/stackgres/validation/sgobjectstorage'
227-
caBundle: {{ $cert }}
228212
admissionReviewVersions: ["v1"]
229213
{{- if .Values.allowedNamespaces }}
230214
namespaceSelector:
@@ -235,7 +219,7 @@ webhooks:
235219
matchLabels:
236220
{{ toYaml .Values.allowedNamespaceLabelSelector | nindent 8 }}
237221
{{- end }}
238-
- name: sgscripts.validating-webhook.stackgres.io
222+
- name: sgscript.validating-webhook.stackgres.io
239223
sideEffects: None
240224
rules:
241225
- operations: ["CREATE", "UPDATE", "DELETE"]
@@ -248,7 +232,6 @@ webhooks:
248232
namespace: {{ .Release.Namespace }}
249233
name: {{ .Release.Name }}
250234
path: '/stackgres/validation/sgscript'
251-
caBundle: {{ $cert }}
252235
admissionReviewVersions: ["v1"]
253236
{{- if .Values.allowedNamespaces }}
254237
namespaceSelector:
@@ -259,7 +242,7 @@ webhooks:
259242
matchLabels:
260243
{{ toYaml .Values.allowedNamespaceLabelSelector | nindent 8 }}
261244
{{- end }}
262-
- name: sgshardedclusters.validating-webhook.stackgres.io
245+
- name: sgshardedcluster.validating-webhook.stackgres.io
263246
sideEffects: None
264247
rules:
265248
- operations: ["CREATE", "UPDATE", "DELETE"]
@@ -272,7 +255,6 @@ webhooks:
272255
namespace: {{ .Release.Namespace }}
273256
name: {{ .Release.Name }}
274257
path: '/stackgres/validation/sgshardedcluster'
275-
caBundle: {{ $cert }}
276258
admissionReviewVersions: ["v1"]
277259
{{- if .Values.allowedNamespaces }}
278260
namespaceSelector:
@@ -283,7 +265,7 @@ webhooks:
283265
matchLabels:
284266
{{ toYaml .Values.allowedNamespaceLabelSelector | nindent 8 }}
285267
{{- end }}
286-
- name: sgshardedbackups.validating-webhook.stackgres.io
268+
- name: sgshardedbackup.validating-webhook.stackgres.io
287269
sideEffects: None
288270
rules:
289271
- operations: ["CREATE", "UPDATE", "DELETE"]
@@ -296,7 +278,6 @@ webhooks:
296278
namespace: {{ .Release.Namespace }}
297279
name: {{ .Release.Name }}
298280
path: '/stackgres/validation/sgshardedbackup'
299-
caBundle: {{ $cert }}
300281
admissionReviewVersions: ["v1"]
301282
{{- if .Values.allowedNamespaces }}
302283
namespaceSelector:
@@ -320,7 +301,6 @@ webhooks:
320301
namespace: {{ .Release.Namespace }}
321302
name: {{ .Release.Name }}
322303
path: '/stackgres/validation/sgshardeddbops'
323-
caBundle: {{ $cert }}
324304
admissionReviewVersions: ["v1"]
325305
{{- if .Values.allowedNamespaces }}
326306
namespaceSelector:
@@ -331,7 +311,7 @@ webhooks:
331311
matchLabels:
332312
{{ toYaml .Values.allowedNamespaceLabelSelector | nindent 8 }}
333313
{{- end }}
334-
- name: sgstreams.validating-webhook.stackgres.io
314+
- name: sgstream.validating-webhook.stackgres.io
335315
sideEffects: None
336316
rules:
337317
- operations: ["CREATE", "UPDATE", "DELETE"]
@@ -343,8 +323,7 @@ webhooks:
343323
service:
344324
namespace: {{ .Release.Namespace }}
345325
name: {{ .Release.Name }}
346-
path: '/stackgres/validation/sgstreams'
347-
caBundle: {{ $cert }}
326+
path: '/stackgres/validation/sgstream'
348327
admissionReviewVersions: ["v1"]
349328
{{- if .Values.allowedNamespaces }}
350329
namespaceSelector:
@@ -355,4 +334,4 @@ webhooks:
355334
matchLabels:
356335
{{ toYaml .Values.allowedNamespaceLabelSelector | nindent 8 }}
357336
{{- end }}
358-
337+

‎stackgres-k8s/src/common/src/main/resources/crds/SGDbOps.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -759,12 +759,10 @@ spec:
759759
properties:
760760
scaleFactor:
761761
type: number
762-
nullable: true
763762
description: |
764763
The scale factor used to run pgbench (`--scale`).
765764
transactionsProcessed:
766765
type: integer
767-
nullable: true
768766
description: |
769767
The number of transactions processed.
770768
latency:
@@ -779,12 +777,10 @@ spec:
779777
properties:
780778
value:
781779
type: number
782-
nullable: true
783780
description: |
784781
The latency average value
785782
unit:
786783
type: string
787-
nullable: false
788784
description: |
789785
The latency measure unit
790786
standardDeviation:
@@ -794,12 +790,10 @@ spec:
794790
properties:
795791
value:
796792
type: number
797-
nullable: true
798793
description: |
799794
The latency standard deviation value
800795
unit:
801796
type: string
802-
nullable: false
803797
description: |
804798
The latency measure unit
805799
transactionsPerSecond:
@@ -827,12 +821,10 @@ spec:
827821
properties:
828822
value:
829823
type: number
830-
nullable: true
831824
description: |
832825
The Transactions Per Second (tps) excluding connections establishing value
833826
unit:
834827
type: string
835-
nullable: false
836828
description: |
837829
Transactions Per Second (tps) measure unit
838830
overTime:

‎stackgres-k8s/src/common/src/main/resources/crds/SGDistributedLogs.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ spec:
8585
Name of an existing StorageClass in the Kubernetes cluster, used to create the PersistentVolumes for the instances of the cluster.
8686
postgresServices:
8787
type: object
88-
nullable: true
8988
description: |
9089
Kubernetes [services](https://kubernetes.io/docs/concepts/services-networking/service/) created or managed by StackGres.
9190

0 commit comments

Comments
 (0)