diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54ba198ffbd8d2e9b283372d7fa555661b7bcf0b..675fdb5a37f937f15f0ef56b1c0d6cfecbc96b82 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,7 +105,7 @@ Upgrade helm: script: - bash - cd "$CI_PROJECT_DIR"/k8s - - envsubst < values.yml | helm upgrade --install becskasszasch . -n apps --wait --values - + - envsubst < values.yml | helm upgrade --install --wait becskasszasch . -n apps --values - rules: - if: $CI_COMMIT_TAG when: manual diff --git a/k8s/templates/deployment.yml b/k8s/templates/deployment.yml index fe9178e0081661dda32f00455847e575816a608d..6bc9afa5a5b760305a7376f8628520da2cb95046 100644 --- a/k8s/templates/deployment.yml +++ b/k8s/templates/deployment.yml @@ -33,7 +33,7 @@ spec: httpGet: path: "/" port: 8080 - initialDelaySeconds: 30 + initialDelaySeconds: 60 failureThreshold: 3 periodSeconds: 10 imagePullSecrets: diff --git a/k8s/templates/secret.yml b/k8s/templates/secret.yml index df00b113f7f39e2092dfb2c9b6371c60af46b0e7..ecbd396f6afd6d2feddeb874f99cc88563aa2ae5 100644 --- a/k8s/templates/secret.yml +++ b/k8s/templates/secret.yml @@ -10,12 +10,12 @@ stringData: POSTGRES_USER: "{{ .Values.POSTGRES_USER }}" POSTGRES_DB: "{{ .Values.POSTGRES_DB }}" -{{/*---*/}} -{{/*apiVersion: v1*/}} -{{/*data:*/}} -{{/* .dockerconfigjson: "{{ .Values.REGISTRY_CONF }}"*/}} -{{/*kind: Secret*/}} -{{/*metadata:*/}} -{{/* name: devteam-nexus-login*/}} -{{/* namespace: apps*/}} -{{/*type: kubernetes.io/dockerconfigjson*/}} +--- +apiVersion: v1 +data: + .dockerconfigjson: "{{ .Values.REGISTRY_CONF }}" +kind: Secret +metadata: + name: devteam-nexus-login + namespace: apps +type: kubernetes.io/dockerconfigjson \ No newline at end of file