From f61516c9836be954797af9a363fe7f16534ad66f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1lint=20R=C3=A9thelyi?= <rethelyibalint@gmail.com>
Date: Tue, 3 Aug 2021 21:48:45 +0200
Subject: [PATCH] update ci
---
.gitlab-ci.yml | 2 +-
k8s/templates/deployment.yml | 2 +-
k8s/templates/secret.yml | 18 +++++++++---------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54ba198..675fdb5 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 fe9178e..6bc9afa 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 df00b11..ecbd396 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
--
GitLab