Merge branch 'master' into publish-chart-independently

kubeflow · Apr 12, 2024 · 8d38ad7 · 8d38ad7
2 parents 03036b1 + 59badbf
commit 8d38ad7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -71,6 +71,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push Spark-Operator Docker Image to github container registry
+        id: build
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -136,6 +137,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
       - name: Release Spark-Operator Helm Chart
         uses: helm/[email protected]
         env:

diff --git a/charts/spark-operator-chart/Chart.yaml b/charts/spark-operator-chart/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: spark-operator
 description: A Helm chart for Spark on Kubernetes operator
 version: 1.2.3
-appVersion: v1beta2-1.4.1-3.5.0
+appVersion: v1beta2-1.4.2-3.5.0
 keywords:
   - spark
 home: https://github.com/kubeflow/spark-operator

diff --git a/charts/spark-operator-chart/README.md b/charts/spark-operator-chart/README.md
@@ -140,6 +140,7 @@ All charts linted successfully
 | webhook.initResources | object | `{}` | Resources applied to init job |
 | webhook.namespaceSelector | string | `""` | The webhook server will only operate on namespaces with this label, specified in the form key1=value1,key2=value2. Empty string (default) will operate on all namespaces |
 | webhook.port | int | `8080` | Webhook service port |
+| webhook.portName | string | `"webhook"` | Webhook container port name and service target port name |
 | webhook.timeout | int | `30` |  |
 
 ## Maintainers

diff --git a/charts/spark-operator-chart/templates/deployment.yaml b/charts/spark-operator-chart/templates/deployment.yaml
@@ -52,10 +52,16 @@ spec:
           {{- toYaml .Values.envFrom | nindent 10 }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 10 }}
-        {{- if .Values.metrics.enable }}
+        {{- if or .Values.metrics.enable .Values.webhook.enable }}
         ports:
+          {{ if .Values.metrics.enable }}
           - name: {{ .Values.metrics.portName | quote }}
             containerPort: {{ .Values.metrics.port }}
+          {{ end }}
+          {{ if .Values.webhook.enable }}
+          - name: {{ .Values.webhook.portName | quote }}
+            containerPort: {{ .Values.webhook.port }}
+          {{ end }}
         {{ end }}
         args:
         - -v={{ .Values.logLevel }}

diff --git a/charts/spark-operator-chart/templates/webhook-service.yaml b/charts/spark-operator-chart/templates/webhook-service.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   ports:
   - port: 443
-    targetPort: {{ .Values.webhook.port }}
+    targetPort: {{ .Values.webhook.portName | quote }}
     name: webhook
   selector:
     {{- include "spark-operator.selectorLabels" . | nindent 4 }}

diff --git a/charts/spark-operator-chart/values.yaml b/charts/spark-operator-chart/values.yaml
@@ -96,6 +96,8 @@ webhook:
   enable: false
   # -- Webhook service port
   port: 8080
+  # -- Webhook container port name and service target port name
+  portName: webhook
   # -- The webhook server will only operate on namespaces with this label, specified in the form key1=value1,key2=value2.
   # Empty string (default) will operate on all namespaces
   namespaceSelector: ""