Add support for sparkoperator webhook (#284)

* Update spark-operator.yaml * Add RBAC for sparkoperator * Webhook Support
flyteorg · Apr 21, 2020 · 22892e3 · 22892e3
1 parent 0947970
commit 22892e3
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 7 deletions.
diff --git a/deployment/sandbox/flyte_generated.yaml b/deployment/sandbox/flyte_generated.yaml
@@ -365,6 +365,7 @@ rules:
   resources:
   - services
   - configmaps
+  - secrets
   verbs:
   - create
   - get
@@ -880,6 +881,20 @@ spec:
     app: contour
   type: NodePort
 ---
+apiVersion: v1
+kind: Service
+metadata:
+  name: spark-webhook
+  namespace: sparkoperator
+spec:
+  ports:
+  - name: webhook
+    port: 443
+    targetPort: 8080
+  selector:
+    app.kubernetes.io/name: sparkoperator
+    app.kubernetes.io/version: v2.4.0-v1beta1
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -1347,15 +1362,15 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: sparkoperator
-    app.kubernetes.io/version: v2.4.0-v1alpha1
+    app.kubernetes.io/version: v2.4.0-v1beta1
   name: sparkoperator
   namespace: sparkoperator
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: sparkoperator
-      app.kubernetes.io/version: v2.4.0-v1alpha1
+      app.kubernetes.io/version: v2.4.0-v1beta1
   strategy:
     type: Recreate
   template:
@@ -1366,7 +1381,7 @@ spec:
         prometheus.io/scrape: "true"
       labels:
         app.kubernetes.io/name: sparkoperator
-        app.kubernetes.io/version: v2.4.0-v1alpha1
+        app.kubernetes.io/version: v2.4.0-v1beta1
     spec:
       containers:
       - args:
@@ -1377,14 +1392,24 @@ spec:
         - '-metrics-prefix=service:'
         - -metrics-labels=task_name
         - -metrics-labels=workflow_name
+        - -enable-webhook=true
+        - -webhook-svc-namespace=sparkoperator
         command:
         - /usr/bin/spark-operator
         image: gcr.io/spark-operator/spark-operator:v2.4.0-v1beta1-0.9.0
         imagePullPolicy: Always
         name: sparkoperator-unknown
         ports:
         - containerPort: 10254
+        - containerPort: 8080
+        volumeMounts:
+        - mountPath: /etc/webhook-certs
+          name: webhook-certs
       serviceAccountName: sparkoperator
+      volumes:
+      - name: webhook-certs
+        secret:
+          secretName: spark-webhook-certs
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -1483,6 +1508,34 @@ spec:
             name: config-volume
   schedule: '*/1 * * * *'
 ---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  labels:
+    app.kubernetes.io/name: sparkoperator
+    app.kubernetes.io/version: v2.4.0-v1beta1
+  name: sparkoperator-init
+  namespace: sparkoperator
+spec:
+  backoffLimit: 3
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: sparkoperator
+        app.kubernetes.io/version: v2.4.0-v1beta1
+    spec:
+      containers:
+      - command:
+        - /usr/bin/gencerts.sh
+        - --namespace
+        - sparkoperator
+        - -p
+        image: gcr.io/spark-operator/spark-operator:v2.4.0-v1beta1-0.9.0
+        imagePullPolicy: IfNotPresent
+        name: main
+      restartPolicy: Never
+      serviceAccountName: sparkoperator
+---
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:

diff --git a/kustomize/base/operators/spark/deployment.yaml b/kustomize/base/operators/spark/deployment.yaml
@@ -5,13 +5,13 @@ metadata:
   namespace: sparkoperator
   labels:
     app.kubernetes.io/name: sparkoperator
-    app.kubernetes.io/version: v2.4.0-v1alpha1
+    app.kubernetes.io/version: v2.4.0-v1beta1
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: sparkoperator
-      app.kubernetes.io/version: v2.4.0-v1alpha1
+      app.kubernetes.io/version: v2.4.0-v1beta1
   strategy:
     type: Recreate
   template:
@@ -22,16 +22,24 @@ spec:
         prometheus.io/path: "/metrics"
       labels:
         app.kubernetes.io/name: sparkoperator
-        app.kubernetes.io/version: v2.4.0-v1alpha1
+        app.kubernetes.io/version: v2.4.0-v1beta1
     spec:
       serviceAccountName: sparkoperator
+      volumes:
+        - name: webhook-certs
+          secret:
+            secretName: spark-webhook-certs
       containers:
       - name: sparkoperator-unknown
         image: gcr.io/spark-operator/spark-operator:v2.4.0-v1beta1-0.9.0
+        volumeMounts:
+          - name: webhook-certs
+            mountPath: /etc/webhook-certs
         imagePullPolicy: Always
         command: ["/usr/bin/spark-operator"]
         ports:
           - containerPort: 10254
+          - containerPort: 8080
         args:
         - -logtostderr
         - -v=2
@@ -40,3 +48,5 @@ spec:
         - "-metrics-prefix=service:"
         - -metrics-labels=task_name
         - -metrics-labels=workflow_name
+        - -enable-webhook=true
+        - -webhook-svc-namespace=sparkoperator
diff --git a/kustomize/base/operators/spark/kustomization.yaml b/kustomize/base/operators/spark/kustomization.yaml
@@ -2,3 +2,4 @@ resources:
 - spark-operator.yaml
 - spark-dummy-crd.yaml
 - deployment.yaml
+- webhook.yaml
diff --git a/kustomize/base/operators/spark/spark-operator.yaml b/kustomize/base/operators/spark/spark-operator.yaml
@@ -18,7 +18,7 @@ rules:
   resources: ["pods"]
   verbs: ["*"]
 - apiGroups: [""]
-  resources: ["services", "configmaps"]
+  resources: ["services", "configmaps", "secrets"]
   verbs: ["create", "get", "delete"]
 - apiGroups: ["extensions"]
   resources: ["ingresses"]

diff --git a/kustomize/base/operators/spark/webhook.yaml b/kustomize/base/operators/spark/webhook.yaml
@@ -0,0 +1,37 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: sparkoperator-init
+  namespace: sparkoperator
+  labels:
+    app.kubernetes.io/name: sparkoperator
+    app.kubernetes.io/version: v2.4.0-v1beta1
+spec:
+  backoffLimit: 3
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: sparkoperator
+        app.kubernetes.io/version: v2.4.0-v1beta1
+    spec:
+      serviceAccountName: sparkoperator
+      restartPolicy: Never
+      containers:
+        - name: main
+          image: gcr.io/spark-operator/spark-operator:v2.4.0-v1beta1-0.9.0
+          imagePullPolicy: IfNotPresent
+          command: ["/usr/bin/gencerts.sh","--namespace", "sparkoperator", "-p"]
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: spark-webhook
+  namespace: sparkoperator
+spec:
+  ports:
+    - port: 443
+      targetPort: 8080
+      name: webhook
+  selector:
+    app.kubernetes.io/name: sparkoperator
+    app.kubernetes.io/version: v2.4.0-v1beta1