[skywalking-kubernetes] branch master updated: use default startupProbe (#110)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git


The following commit(s) were added to refs/heads/master by this push:
     new 9f69825  use default startupProbe (#110)
9f69825 is described below

commit 9f69825d1eda3596f77132392bcd6df6c37274fc
Author: innerpeacez <in...@gmail.com>
AuthorDate: Tue Mar 7 13:52:32 2023 +0800

    use default startupProbe (#110)
---
 chart/skywalking/templates/oap-deployment.yaml | 17 +++++++++++------
 chart/skywalking/templates/ui-deployment.yaml  |  2 +-
 chart/skywalking/values.yaml                   | 12 ++++++------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/chart/skywalking/templates/oap-deployment.yaml b/chart/skywalking/templates/oap-deployment.yaml
index ee2d24b..c19d442 100644
--- a/chart/skywalking/templates/oap-deployment.yaml
+++ b/chart/skywalking/templates/oap-deployment.yaml
@@ -91,27 +91,32 @@ spec:
         image: {{ .Values.oap.image.repository }}:{{ required "oap.image.tag is required" .Values.oap.image.tag }}
         imagePullPolicy: {{ .Values.oap.image.pullPolicy }}
         livenessProbe:
-{{- if .Values.oap.livenessProbe}}
+{{- if .Values.oap.livenessProbe }}
 {{ toYaml .Values.oap.livenessProbe | indent 10 }}
 {{ else }}
           tcpSocket:
             port: 12800
           initialDelaySeconds: 5
           periodSeconds: 10
-{{ end }}
+{{- end }}
         startupProbe:
-{{- if .Values.oap.startupProbe}}
+{{- if .Values.oap.startupProbe }}
 {{ toYaml .Values.oap.startupProbe | indent 10 }}
-{{ end }}
+{{ else }}
+          tcpSocket:
+            port: 12800
+          failureThreshold: 9
+          periodSeconds: 10
+{{- end }}
         readinessProbe:
-{{- if .Values.oap.readinessProbe}}
+{{- if .Values.oap.readinessProbe }}
 {{ toYaml .Values.oap.readinessProbe | indent 10 }}
 {{ else }}
           tcpSocket:
             port: 12800
           initialDelaySeconds: 5
           periodSeconds: 10
-{{ end }}
+{{- end }}
         ports:
         {{- range $key, $value :=  .Values.oap.ports }}
         - containerPort: {{ $value }}
diff --git a/chart/skywalking/templates/ui-deployment.yaml b/chart/skywalking/templates/ui-deployment.yaml
index 738fceb..9746107 100644
--- a/chart/skywalking/templates/ui-deployment.yaml
+++ b/chart/skywalking/templates/ui-deployment.yaml
@@ -76,4 +76,4 @@ spec:
 {{- end }}
         env:
         - name: SW_OAP_ADDRESS
-          value: http://{{ template "skywalking.oap.fullname" . }}:{{ .Values.oap.ports.rest }}
+          value: "http://{{ template "skywalking.oap.fullname" . }}:{{ .Values.oap.ports.rest }}"
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 15435ba..f8e6485 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -58,13 +58,13 @@ oap:
     #   port: 12800
     # initialDelaySeconds: 5
     # periodSeconds: 20
-  startupProbe:
-  # Time to boot the applciation is set to:
+  startupProbe: {}
+  # Time to boot the application is set to:
   # 9 (failureThreshold) * 10 (periodSeconds) = 90 seconds in this case.
-    tcpSocket:
-      port: 12800
-    failureThreshold: 9
-    periodSeconds: 10
+    # tcpSocket:
+    #   port: 12800
+    # failureThreshold: 9
+    # periodSeconds: 10
   readinessProbe: {}
     # tcpSocket:
     #   port: 12800