From 0fad06bbf8564e714773f5ce8577399c28a685a4 Mon Sep 17 00:00:00 2001 From: grodionov Date: Fri, 12 Dec 2025 15:45:07 +0300 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D0=B0=D0=BF=D0=BA=D1=83=20=D1=88=D0=B0=D0=B1?= =?UTF-8?q?=D0=BB=D0=BE=D0=BD=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/helm/Chart.yaml | 8 ----- build/helm/templates/deployment.yaml | 50 ---------------------------- build/helm/templates/service.yaml | 16 --------- build/helm/templates/vault.yaml | 23 ------------- build/helm/values.yaml | 43 ------------------------ 5 files changed, 140 deletions(-) delete mode 100644 build/helm/Chart.yaml delete mode 100644 build/helm/templates/deployment.yaml delete mode 100644 build/helm/templates/service.yaml delete mode 100644 build/helm/templates/vault.yaml delete mode 100644 build/helm/values.yaml diff --git a/build/helm/Chart.yaml b/build/helm/Chart.yaml deleted file mode 100644 index 4fb2fa4..0000000 --- a/build/helm/Chart.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -apiVersion: v2 -type: application -name: svc-api -description: Microservice "svc-api" for deck - -version: 0.0.1 -appVersion: 0.0.1 \ No newline at end of file diff --git a/build/helm/templates/deployment.yaml b/build/helm/templates/deployment.yaml deleted file mode 100644 index 9272a81..0000000 --- a/build/helm/templates/deployment.yaml +++ /dev/null @@ -1,50 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: '{{ .Chart.Name }}' - stand: '{{ .Values.stand }}' - name: '{{ .Chart.Name }}' -spec: - replicas: 1 - selector: - matchLabels: - app: '{{ .Chart.Name }}' - stand: '{{ .Values.stand }}' - template: - metadata: - labels: - app: '{{ .Chart.Name }}' - stand: '{{ .Values.stand }}' - version: '{{ .Values.version }}' - contragentCode: 'WZ01112' - billingObject: 'None' - spec: - {{- if .Values.vault.enable }} - serviceAccountName: '{{ .Values.serviceAccountRole }}' - {{- end }} - containers: - - image: '{{ .Values.deployment.image.repository }}:{{.Values.deployment.image.tag }}' - imagePullPolicy: IfNotPresent - name: app - ports: - - containerPort: {{ .Values.deployment.containerPort }} - protocol: TCP - readinessProbe: - {{- toYaml (omit .Values.deployment.readinessProbe "httpGet") | nindent 12 }} - httpGet: - {{- toYaml .Values.deployment.readinessProbe.httpGet | nindent 14 }} - port: {{ .Values.deployment.containerPort }} - livenessProbe: - {{- toYaml (omit .Values.deployment.livenessProbe "tcpSocket") | nindent 12 }} - tcpSocket: - port: {{ .Values.deployment.containerPort }} - - resources: - {{- toYaml .Values.deployment.resources | nindent 12 }} - {{- if .Values.vault.enable }} - envFrom: - - secretRef: - name: '{{ .Chart.Name }}-secrets' - {{- end }} diff --git a/build/helm/templates/service.yaml b/build/helm/templates/service.yaml deleted file mode 100644 index 2c80267..0000000 --- a/build/helm/templates/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: '{{ .Chart.Name }}' - labels: - app: '{{ .Chart.Name }}' - stand: '{{ .Values.stand }}' -spec: - ports: - - port: {{ .Values.deployment.containerPort }} - targetPort: {{ .Values.deployment.containerPort }} - protocol: TCP - selector: - app: '{{ .Chart.Name }}' - stand: '{{ .Values.stand }}' diff --git a/build/helm/templates/vault.yaml b/build/helm/templates/vault.yaml deleted file mode 100644 index 0ede229..0000000 --- a/build/helm/templates/vault.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if .Values.vault.enable }} ---- -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: '{{ .Chart.Name }}' - labels: - app: '{{ .Chart.Name }}' -spec: - refreshInterval: '60s' - secretStoreRef: - name: '{{ .Values.vault.secretStore }}' # имя SecretStore - kind: SecretStore - target: - name: '{{ .Chart.Name }}-secrets' # имя будущего секрета kubernetes - data: - {{- range .Values.vault.secrets }} - - secretKey: {{ . }} - remoteRef: - key: "deck/kubernetes/{{ $.Values.stand }}/{{ $.Chart.Name }}" - property: {{ . }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/build/helm/values.yaml b/build/helm/values.yaml deleted file mode 100644 index 76056dd..0000000 --- a/build/helm/values.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# Пример для DEV сборки -stand: dev -version: "NONE" - -deployment: - image: - repository: drn.tst.nubes.ru/deck-auth-api-test - tag: $VERSION - containerPort: 8080 - resources: - requests: # Начальные запросы - cpu: "500m" - memory: "256Mi" - limits: - cpu: "2" # Максимальные лимиты - memory: "1024Mi" - readinessProbe: - failureThreshold: 5 - initialDelaySeconds: 10 - periodSeconds: 30 - successThreshold: 1 - timeoutSeconds: 5 - httpGet: - path: /api/v1/health - scheme: HTTP - livenessProbe: - failureThreshold: 5 - initialDelaySeconds: 30 - periodSeconds: 15 - successThreshold: 1 - timeoutSeconds: 1 - -vault: - enable: true - secretStore: deck-test - secrets: - - VITE_BACKEND_HOST - - VITE_AUTH_HOST - - VITE_KEYCLOAK_CLIENT_ID - - VITE_KEYCLOAK_REALM - - VITE_KEYCLOAK_REDIRECT_URI - - VITE_KEYCLOAK_URL - - VITE_KEYCLOAK_CLIENT_SECRET From 2b92ca17fc45303aa0ceb6d0fcd9faccada13eb4 Mon Sep 17 00:00:00 2001 From: grodionov Date: Mon, 15 Dec 2025 13:54:36 +0300 Subject: [PATCH 2/2] debug-mode off --- build/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Jenkinsfile b/build/Jenkinsfile index be483b8..041d612 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -1,4 +1,4 @@ -env.DEBUGGING_MODE = true +env.DEBUGGING_MODE = false env.FORCE_BUILD = false timeoutTime = 15