Merge "[SDC] Use Startup probes"

diff --combined kubernetes/sdc/components/sdc-be/values.yaml
index bdaea44,1277fc9..fc3b53f
--- 1/kubernetes/sdc/components/sdc-be/values.yaml
--- 2/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@@ -63,9 -63,9 +63,9 @@@ certInitializer
    truststoreFile: "org.onap.sdc.trust.jks"
    permission_user: 352070
    permission_group: 35953
 -  aaf_add_config: >
 -    /opt/app/aaf_config/bin/agent.sh local showpass
 -    {{.Values.fqi}} {{ .Values.fqdn }} > {{ .Values.credsPath }}/mycreds.prop
 +  aaf_add_config: |
 +    echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" > {{ .Values.credsPath }}/mycreds.prop
 +    echo "cadi_truststore_password=$cadi_truststore_password" >> {{ .Values.credsPath }}/mycreds.prop
  
  #################################################################
  # SDC Config part
@@@ -83,18 -83,29 +83,29 @@@ affinity: {
  
  # probe configuration parameters
  liveness:
-   initialDelaySeconds: 120
+   initialDelaySeconds: 1
    periodSeconds: 10
    timeoutSeconds: 5
+   successThreshold: 1
+   failureThreshold: 3
    # necessary to disable liveness probe when setting breakpoints
    # in debugger so K8s doesn't restart unresponsive container
    port: api
    enabled: true
  
  readiness:
-   initialDelaySeconds: 60
+   initialDelaySeconds: 1
    periodSeconds: 10
    timeoutSeconds: 5
+   successThreshold: 1
+   failureThreshold: 3
+ 
+ startup:
+   initialDelaySeconds: 10
+   periodSeconds: 10
+   timeoutSeconds: 5
+   successThreshold: 1
+   failureThreshold: 60
  
  service:
    type: NodePort

diff --combined kubernetes/sdc/components/sdc-fe/values.yaml
index 1e269d0,dcebc47..dde22b5
--- 1/kubernetes/sdc/components/sdc-fe/values.yaml
--- 2/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@@ -39,9 -39,9 +39,9 @@@ certInitializer
    truststoreFile: "org.onap.sdc.trust.jks"
    permission_user: 352070
    permission_group: 35953
 -  aaf_add_config: >
 -    /opt/app/aaf_config/bin/agent.sh local showpass
 -    {{.Values.fqi}} {{ .Values.fqdn }} > {{ .Values.credsPath }}/mycreds.prop
 +  aaf_add_config: |
 +    echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" > {{ .Values.credsPath }}/mycreds.prop
 +    echo "cadi_truststore_password=$cadi_truststore_password" >> {{ .Values.credsPath }}/mycreds.prop
  
  #################################################################
  # Application configuration defaults.
@@@ -76,17 -76,28 +76,28 @@@ affinity: {
  
  # probe configuration parameters
  liveness:
-   initialDelaySeconds: 10
-   periodSeconds: 60
+   initialDelaySeconds: 1
+   periodSeconds: 10
    timeoutSeconds: 15
+   successThreshold: 1
+   failureThreshold: 3
    # necessary to disable liveness probe when setting breakpoints
    # in debugger so K8s doesn't restart unresponsive container
    enabled: true
  
  readiness:
+   initialDelaySeconds: 1
+   periodSeconds: 10
+   timeoutSeconds: 15
+   successThreshold: 1
+   failureThreshold: 3
+ 
+ startup:
    initialDelaySeconds: 10
-   periodSeconds: 60
+   periodSeconds: 10
    timeoutSeconds: 15
+   successThreshold: 1
+   failureThreshold: 60
  
  service:
    #Example service definition with external, internal and node ports.

diff --combined kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
index af53fd6,eb85465..7251006
--- 1/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
--- 2/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/templates/deployment.yaml
@@@ -93,7 -93,7 +93,7 @@@ spec
              memory: 20Mi
        {{- end }}
        - name: volume-permissions
 -        image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }}
 +        image: {{ include "repositoryGenerator.image.busybox" . }}
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
          command:
            - sh
@@@ -128,6 -128,8 +128,8 @@@
              initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
              periodSeconds: {{ .Values.liveness.periodSeconds }}
              timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
+             successThreshold: {{ .Values.liveness.successThreshold }}
+             failureThreshold: {{ .Values.liveness.failureThreshold }}
            {{ end }}
            readinessProbe:
              exec:
@@@ -135,7 -137,18 +137,18 @@@
                - "/var/lib/jetty/ready-probe.sh"
              initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
              periodSeconds: {{ .Values.readiness.periodSeconds }}
-             timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
+             timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
+             successThreshold: {{ .Values.readiness.successThreshold }}
+             failureThreshold: {{ .Values.readiness.failureThreshold }}
+           startupProbe:
+             exec:
+               command:
+               - "/var/lib/jetty/ready-probe.sh"
+             initialDelaySeconds: {{ .Values.startup.initialDelaySeconds }}
+             periodSeconds: {{ .Values.startup.periodSeconds }}
+             timeoutSeconds: {{ .Values.startup.timeoutSeconds }}
+             successThreshold: {{ .Values.startup.successThreshold }}
+             failureThreshold: {{ .Values.startup.failureThreshold }}
            resources: {{ include "common.resources" . | nindent 12 }}
            env:
            - name: ENVNAME

diff --combined kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index d2dd808,ddff1d3..f26a020
--- 1/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
--- 2/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@@ -51,9 -51,9 +51,9 @@@ certInitializer
    truststoreFile: "org.onap.sdc.trust.jks"
    permission_user: 352070
    permission_group: 35953
 -  aaf_add_config: >
 -    /opt/app/aaf_config/bin/agent.sh local showpass
 -    {{.Values.fqi}} {{ .Values.fqdn }} > {{ .Values.credsPath }}/mycreds.prop
 +  aaf_add_config: |
 +    echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" > {{ .Values.credsPath }}/mycreds.prop
 +    echo "cadi_truststore_password=$cadi_truststore_password" >> {{ .Values.credsPath }}/mycreds.prop
  
  #################################################################
  # Application configuration defaults.
@@@ -83,17 -83,28 +83,28 @@@ affinity: {
  
  # probe configuration parameters
  liveness:
-   initialDelaySeconds: 120
-   periodSeconds: 60
+   initialDelaySeconds: 1
+   periodSeconds: 10
    timeoutSeconds: 15
+   successThreshold: 1
+   failureThreshold: 3
    # necessary to disable liveness probe when setting breakpoints
    # in debugger so K8s doesn't restart unresponsive container
    enabled: true
  
  readiness:
-   initialDelaySeconds: 120
-   periodSeconds: 60
+   initialDelaySeconds: 1
+   periodSeconds: 10
    timeoutSeconds: 15
+   successThreshold: 1
+   failureThreshold: 3
+ 
+ startup:
+   initialDelaySeconds: 10
+   periodSeconds: 10
+   timeoutSeconds: 15
+   successThreshold: 1
+   failureThreshold: 60
  
  service:
    type: ClusterIP

diff --combined kubernetes/sdc/components/sdc-wfd-be/values.yaml
index dbd6438,0d75ae3..d4414f1
--- 1/kubernetes/sdc/components/sdc-wfd-be/values.yaml
--- 2/kubernetes/sdc/components/sdc-wfd-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
@@@ -50,9 -50,9 +50,9 @@@ certInitializer
    truststoreFile: "org.onap.sdc.trust.jks"
    permission_user: 352070
    permission_group: 35953
 -  aaf_add_config: >
 -    /opt/app/aaf_config/bin/agent.sh local showpass
 -    {{.Values.fqi}} {{ .Values.fqdn }} > {{ .Values.credsPath }}/mycreds.prop
 +  aaf_add_config: |
 +    echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" > {{ .Values.credsPath }}/mycreds.prop
 +    echo "cadi_truststore_password=$cadi_truststore_password" >> {{ .Values.credsPath }}/mycreds.prop
  
  #################################################################
  # Application configuration defaults.
@@@ -101,6 -101,28 +101,28 @@@ readiness
    initialDelaySeconds: 60
    periodSeconds: 10
  
+ # probe configuration parameters
+ liveness:
+   initialDelaySeconds: 1
+   periodSeconds: 10
+   successThreshold: 1
+   failureThreshold: 3
+   # necessary to disable liveness probe when setting breakpoints
+   # in debugger so K8s doesn't restart unresponsive container
+   enabled: true
+ 
+ readiness:
+   initialDelaySeconds: 1
+   periodSeconds: 10
+   successThreshold: 1
+   failureThreshold: 3
+ 
+ startup:
+   initialDelaySeconds: 10
+   periodSeconds: 10
+   successThreshold: 1
+   failureThreshold: 60
+ 
  service:
    type: NodePort
    portName: sdc-wfd-be

diff --combined kubernetes/sdc/components/sdc-wfd-fe/values.yaml
index e001f2f,235931b..3cc9b95
--- 1/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
--- 2/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
@@@ -39,9 -39,9 +39,9 @@@ certInitializer
    truststoreFile: "org.onap.sdc.trust.jks"
    permission_user: 352070
    permission_group: 35953
 -  aaf_add_config: >
 -    /opt/app/aaf_config/bin/agent.sh local showpass
 -    {{.Values.fqi}} {{ .Values.fqdn }} > {{ .Values.credsPath }}/mycreds.prop
 +  aaf_add_config: |
 +    echo "cadi_keystore_password_p12=$cadi_keystore_password_p12" > {{ .Values.credsPath }}/mycreds.prop
 +    echo "cadi_truststore_password=$cadi_truststore_password" >> {{ .Values.credsPath }}/mycreds.prop
  
  #################################################################
  # Application configuration defaults.
@@@ -77,15 -77,25 +77,25 @@@ affinity: {
  
  # probe configuration parameters
  liveness:
-   initialDelaySeconds: 60
+   initialDelaySeconds: 1
    periodSeconds: 10
+   successThreshold: 1
+   failureThreshold: 3
    # necessary to disable liveness probe when setting breakpoints
    # in debugger so K8s doesn't restart unresponsive container
    enabled: true
  
  readiness:
-   initialDelaySeconds: 60
+   initialDelaySeconds: 1
    periodSeconds: 10
+   successThreshold: 1
+   failureThreshold: 3
+ 
+ startup:
+   initialDelaySeconds: 10
+   periodSeconds: 10
+   successThreshold: 1
+   failureThreshold: 60
  
  service:
    type: NodePort