Merge pull request #77 from kubedb/opsvalidator

kubedb · May 20, 2020 · 19aa0a1 · 19aa0a1
2 parents ce37683 + 103ca84
commit 19aa0a1
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/charts/kubedb/templates/apiregistration.yaml b/charts/kubedb/templates/apiregistration.yaml
@@ -50,6 +50,25 @@ spec:
   groupPriorityMinimum: {{ .Values.apiserver.groupPriorityMinimum }}
   versionPriority: {{ .Values.apiserver.versionPriority }}
 {{- end }}
+{{- if and (.Values.apiserver.enableValidatingWebhook) (.Values.enterprise.enabled) }}
+---
+apiVersion: apiregistration.k8s.io/v1beta1
+kind: APIService
+metadata:
+  name: v1alpha1.opsvalidators.kubedb.com
+  labels:
+    {{- include "kubedb.labels" . | nindent 4 }}
+spec:
+  group: opsvalidators.kubedb.com
+  version: v1alpha1
+  service:
+    namespace: {{ .Release.Namespace }}
+    name: {{ include "kubedb.fullname" . }}
+    port: {{ .Values.enterprise.port }}
+  caBundle: {{ $caCrt }}
+  groupPriorityMinimum: {{ .Values.apiserver.groupPriorityMinimum }}
+  versionPriority: {{ .Values.apiserver.versionPriority }}
+{{- end }}
 ---
 apiVersion: v1
 kind: Secret

diff --git a/charts/kubedb/templates/service.yaml b/charts/kubedb/templates/service.yaml
@@ -18,7 +18,7 @@ spec:
     port: 443
     targetPort: operator
   - name: enterprise
-    port: 9443
+    port: {{ .Values.enterprise.port }}
     targetPort: enterprise
   selector:
     {{- include "kubedb.selectorLabels" . | nindent 4 }}
diff --git a/charts/kubedb/templates/validating-webhook.yaml b/charts/kubedb/templates/validating-webhook.yaml
@@ -240,4 +240,22 @@ webhooks:
 {{- if and (ge $major 1) (ge $minor 12) }}
   sideEffects: None
 {{- end }}
+{{- if (eq .Values.enterprise.repository "kubedb-enterprise-operator") }}
+- name: mysqlopsrequestvalidator.opsvalidators.kubedb.com
+  clientConfig:
+    service:
+      namespace: default
+      name: kubernetes
+      path: /apis/opsvalidators.kubedb.com/v1alpha1/mysqlopsrequestvalidators
+    caBundle: {{ b64enc .Values.apiserver.ca }}
+  rules:
+    - apiGroups: ["ops.kubedb.com"]
+      apiVersions: ["*"]
+      resources: ["mysqlopsrequests"]
+      operations: ["CREATE", "UPDATE", "DELETE"]
+  failurePolicy: Fail
+{{- if and (ge $major 1) (ge $minor 12) }}
+  sideEffects: None
+{{- end }}
+{{- end }}
 {{ end }}