diff --git a/apps/cde/base/cde-flowscallback.yaml b/apps/cde/base/cde-flowscallback.yaml index 406212e..a7c9716 100644 --- a/apps/cde/base/cde-flowscallback.yaml +++ b/apps/cde/base/cde-flowscallback.yaml @@ -42,7 +42,7 @@ spec: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/flowscallback-worker:prod_9f3c1d2a + _default: cr.yandex/crp3ccidau046kdj8g9q/flowscallback-worker:prod_4.5.0 pullPolicy: _default: IfNotPresent @@ -56,7 +56,7 @@ spec: _default: 1 port: - _default: 8000 + _default: 8080 command: _default: ["/bin/bash", "-lc"] @@ -70,9 +70,9 @@ spec: resources: requests: cpu: - _default: 25m + _default: "1" memory: - _default: 128Mi + _default: 4Gi probes: liveness: @@ -89,11 +89,6 @@ spec: name: _default: regcred - envs: - - name: S3_IS_CONTOUR - value: - _default: "true" - podAnnotations: _default: traffic.sidecar.istio.io/excludeOutboundPorts: "8200" diff --git a/apps/cde/base/cde-splitpdf.yaml b/apps/cde/base/cde-splitpdf.yaml index a50615f..0dae414 100644 --- a/apps/cde/base/cde-splitpdf.yaml +++ b/apps/cde/base/cde-splitpdf.yaml @@ -42,7 +42,7 @@ spec: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/splitpdf-worker:prod_9f3c1d2a + _default: cr.yandex/crp3ccidau046kdj8g9q/splitpdf-worker:prod_4.5.0 pullPolicy: _default: IfNotPresent @@ -56,7 +56,7 @@ spec: _default: 1 port: - _default: 8000 + _default: 8080 command: _default: ["/bin/bash", "-lc"] @@ -70,9 +70,9 @@ spec: resources: requests: cpu: - _default: 25m + _default: "1" memory: - _default: 128Mi + _default: 4Gi probes: liveness: @@ -89,11 +89,6 @@ spec: name: _default: regcred - envs: - - name: S3_IS_CONTOUR - value: - _default: "true" - podAnnotations: _default: traffic.sidecar.istio.io/excludeOutboundPorts: "8200" diff --git a/apps/cde/base/cde-worker-alert.yaml b/apps/cde/base/cde-worker-alert.yaml new file mode 100644 index 0000000..142b7a3 --- /dev/null +++ b/apps/cde/base/cde-worker-alert.yaml @@ -0,0 +1,111 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-worker-alert + namespace: cde + +spec: + interval: 10m + + chart: + spec: + chart: universal-chart + version: "0.1.9" + sourceRef: + kind: HelmRepository + name: yc-oci-charts + namespace: flux-system + interval: 10m + + install: + remediation: + retries: 3 + + upgrade: + remediation: + retries: 3 + + values: + global: + env: _default + + services: + cde-worker-alert: + enabled: true + + serviceAccount: + enabled: + _default: true + name: + _default: cde-vault + + image: + name: + _default: cr.yandex/crp3ccidau046kdj8g9q/orchestrator:latest + pullPolicy: + _default: IfNotPresent + + deployment: + enabled: true + + name: + _default: cde-worker-alert + + replicaCount: + _default: 1 + + port: + _default: 8080 + + command: + _default: ["/bin/bash", "-lc"] + args: + _default: + - | + set -e + source /vault/secrets/cde-env + exec /worker + + resources: + requests: + cpu: + _default: "1" + memory: + _default: 4Gi + + probes: + liveness: + enabled: false + readiness: + enabled: false + + service: + enabled: false + + imagePullSecrets: + enabled: + _default: true + name: + _default: regcred + + podAnnotations: + _default: + traffic.sidecar.istio.io/excludeOutboundPorts: "8200" + vault.hashicorp.com/agent-init-first: "true" + vault.hashicorp.com/agent-inject: "true" + vault.hashicorp.com/agent-pre-populate-only: "true" + vault.hashicorp.com/auth-path: auth/kubernetes + vault.hashicorp.com/role: cde + vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde + vault.hashicorp.com/agent-inject-template-cde-env: |- + {{- with secret "secrets/data/vault/apps/cde" -}} + {{- range $k, $v := .Data.data }} + export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }}) + {{- end }} + {{- end -}} + + commitSha: "" + gitlabUri: "" + gitlabJobUrl: "" + owner: "" diff --git a/apps/cde/base/cde-worker-copy.yaml b/apps/cde/base/cde-worker-copy.yaml index 622243f..1aaafe0 100644 --- a/apps/cde/base/cde-worker-copy.yaml +++ b/apps/cde/base/cde-worker-copy.yaml @@ -42,7 +42,7 @@ spec: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/copy-worker:prod_9f3c1d2a + _default: cr.yandex/crp3ccidau046kdj8g9q/copy-worker:prod_4.5.0 pullPolicy: _default: IfNotPresent @@ -53,10 +53,10 @@ spec: _default: cde-worker-copy replicaCount: - _default: 1 + _default: 2 port: - _default: 8000 + _default: 8080 command: _default: ["/bin/bash", "-lc"] @@ -70,9 +70,9 @@ spec: resources: requests: cpu: - _default: 25m + _default: "2" memory: - _default: 128Mi + _default: 4Gi probes: liveness: @@ -89,11 +89,6 @@ spec: name: _default: regcred - envs: - - name: S3_IS_CONTOUR - value: - _default: "true" - podAnnotations: _default: traffic.sidecar.istio.io/excludeOutboundPorts: "8200" diff --git a/apps/cde/base/cde-worker-copyv2.yaml b/apps/cde/base/cde-worker-copyv2.yaml new file mode 100644 index 0000000..9f06f17 --- /dev/null +++ b/apps/cde/base/cde-worker-copyv2.yaml @@ -0,0 +1,111 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-worker-copyv2 + namespace: cde + +spec: + interval: 10m + + chart: + spec: + chart: universal-chart + version: "0.1.9" + sourceRef: + kind: HelmRepository + name: yc-oci-charts + namespace: flux-system + interval: 10m + + install: + remediation: + retries: 3 + + upgrade: + remediation: + retries: 3 + + values: + global: + env: _default + + services: + cde-worker-copyv2: + enabled: true + + serviceAccount: + enabled: + _default: true + name: + _default: cde-vault + + image: + name: + _default: cr.yandex/crp3ccidau046kdj8g9q/copyv2-worker:prod_4.5.0 + pullPolicy: + _default: IfNotPresent + + deployment: + enabled: true + + name: + _default: cde-worker-copyv2 + + replicaCount: + _default: 2 + + port: + _default: 8080 + + command: + _default: ["/bin/bash", "-lc"] + args: + _default: + - | + set -e + source /vault/secrets/cde-env + exec /worker + + resources: + requests: + cpu: + _default: "2" + memory: + _default: 4Gi + + probes: + liveness: + enabled: false + readiness: + enabled: false + + service: + enabled: false + + imagePullSecrets: + enabled: + _default: true + name: + _default: regcred + + podAnnotations: + _default: + traffic.sidecar.istio.io/excludeOutboundPorts: "8200" + vault.hashicorp.com/agent-init-first: "true" + vault.hashicorp.com/agent-inject: "true" + vault.hashicorp.com/agent-pre-populate-only: "true" + vault.hashicorp.com/auth-path: auth/kubernetes + vault.hashicorp.com/role: cde + vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde + vault.hashicorp.com/agent-inject-template-cde-env: |- + {{- with secret "secrets/data/vault/apps/cde" -}} + {{- range $k, $v := .Data.data }} + export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }}) + {{- end }} + {{- end -}} + + commitSha: "" + gitlabUri: "" + gitlabJobUrl: "" + owner: "" diff --git a/apps/cde/base/cde-worker-create-versions.yaml b/apps/cde/base/cde-worker-create-versions.yaml index 36b788d..da74f8b 100644 --- a/apps/cde/base/cde-worker-create-versions.yaml +++ b/apps/cde/base/cde-worker-create-versions.yaml @@ -42,7 +42,7 @@ spec: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/createversions-worker:prod_9f3c1d2a + _default: cr.yandex/crp3ccidau046kdj8g9q/createversions-worker:prod_4.5.0 pullPolicy: _default: IfNotPresent @@ -56,7 +56,7 @@ spec: _default: 1 port: - _default: 8000 + _default: 8080 command: _default: ["/bin/bash", "-lc"] @@ -70,9 +70,9 @@ spec: resources: requests: cpu: - _default: 25m + _default: "1" memory: - _default: 128Mi + _default: 4Gi probes: liveness: @@ -89,11 +89,6 @@ spec: name: _default: regcred - envs: - - name: S3_IS_CONTOUR - value: - _default: "true" - podAnnotations: _default: traffic.sidecar.istio.io/excludeOutboundPorts: "8200" diff --git a/apps/cde/base/cde-worker-create-versionsv2.yaml b/apps/cde/base/cde-worker-create-versionsv2.yaml new file mode 100644 index 0000000..44c149f --- /dev/null +++ b/apps/cde/base/cde-worker-create-versionsv2.yaml @@ -0,0 +1,111 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-worker-create-versionsv2 + namespace: cde + +spec: + interval: 10m + + chart: + spec: + chart: universal-chart + version: "0.1.9" + sourceRef: + kind: HelmRepository + name: yc-oci-charts + namespace: flux-system + interval: 10m + + install: + remediation: + retries: 3 + + upgrade: + remediation: + retries: 3 + + values: + global: + env: _default + + services: + cde-worker-create-versionsv2: + enabled: true + + serviceAccount: + enabled: + _default: true + name: + _default: cde-vault + + image: + name: + _default: cr.yandex/crp3ccidau046kdj8g9q/createversionsv2-worker:prod_4.5.0 + pullPolicy: + _default: IfNotPresent + + deployment: + enabled: true + + name: + _default: cde-worker-create-versionsv2 + + replicaCount: + _default: 1 + + port: + _default: 8080 + + command: + _default: ["/bin/bash", "-lc"] + args: + _default: + - | + set -e + source /vault/secrets/cde-env + exec /worker + + resources: + requests: + cpu: + _default: "1" + memory: + _default: 4Gi + + probes: + liveness: + enabled: false + readiness: + enabled: false + + service: + enabled: false + + imagePullSecrets: + enabled: + _default: true + name: + _default: regcred + + podAnnotations: + _default: + traffic.sidecar.istio.io/excludeOutboundPorts: "8200" + vault.hashicorp.com/agent-init-first: "true" + vault.hashicorp.com/agent-inject: "true" + vault.hashicorp.com/agent-pre-populate-only: "true" + vault.hashicorp.com/auth-path: auth/kubernetes + vault.hashicorp.com/role: cde + vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde + vault.hashicorp.com/agent-inject-template-cde-env: |- + {{- with secret "secrets/data/vault/apps/cde" -}} + {{- range $k, $v := .Data.data }} + export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }}) + {{- end }} + {{- end -}} + + commitSha: "" + gitlabUri: "" + gitlabJobUrl: "" + owner: "" diff --git a/apps/cde/base/cde-worker-markings.yaml b/apps/cde/base/cde-worker-markings.yaml index 018bd6a..1710eb7 100644 --- a/apps/cde/base/cde-worker-markings.yaml +++ b/apps/cde/base/cde-worker-markings.yaml @@ -42,7 +42,7 @@ spec: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/markings-worker:prod_9f3c1d2a + _default: cr.yandex/crp3ccidau046kdj8g9q/markings-worker:prod_4.5.0 pullPolicy: _default: IfNotPresent @@ -53,10 +53,10 @@ spec: _default: cde-worker-markings replicaCount: - _default: 1 + _default: 2 port: - _default: 8000 + _default: 8080 command: _default: ["/bin/bash", "-lc"] @@ -70,9 +70,9 @@ spec: resources: requests: cpu: - _default: 25m + _default: "2" memory: - _default: 128Mi + _default: 4Gi probes: liveness: @@ -89,11 +89,6 @@ spec: name: _default: regcred - envs: - - name: S3_IS_CONTOUR - value: - _default: "true" - podAnnotations: _default: traffic.sidecar.istio.io/excludeOutboundPorts: "8200" diff --git a/apps/cde/base/cde-worker-markingsv2.yaml b/apps/cde/base/cde-worker-markingsv2.yaml new file mode 100644 index 0000000..ff1e946 --- /dev/null +++ b/apps/cde/base/cde-worker-markingsv2.yaml @@ -0,0 +1,111 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-worker-markingsv2 + namespace: cde + +spec: + interval: 10m + + chart: + spec: + chart: universal-chart + version: "0.1.9" + sourceRef: + kind: HelmRepository + name: yc-oci-charts + namespace: flux-system + interval: 10m + + install: + remediation: + retries: 3 + + upgrade: + remediation: + retries: 3 + + values: + global: + env: _default + + services: + cde-worker-markingsv2: + enabled: true + + serviceAccount: + enabled: + _default: true + name: + _default: cde-vault + + image: + name: + _default: cr.yandex/crp3ccidau046kdj8g9q/markingsv2-worker:prod_4.5.0 + pullPolicy: + _default: IfNotPresent + + deployment: + enabled: true + + name: + _default: cde-worker-markingsv2 + + replicaCount: + _default: 2 + + port: + _default: 8080 + + command: + _default: ["/bin/bash", "-lc"] + args: + _default: + - | + set -e + source /vault/secrets/cde-env + exec /worker + + resources: + requests: + cpu: + _default: "2" + memory: + _default: 4Gi + + probes: + liveness: + enabled: false + readiness: + enabled: false + + service: + enabled: false + + imagePullSecrets: + enabled: + _default: true + name: + _default: regcred + + podAnnotations: + _default: + traffic.sidecar.istio.io/excludeOutboundPorts: "8200" + vault.hashicorp.com/agent-init-first: "true" + vault.hashicorp.com/agent-inject: "true" + vault.hashicorp.com/agent-pre-populate-only: "true" + vault.hashicorp.com/auth-path: auth/kubernetes + vault.hashicorp.com/role: cde + vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde + vault.hashicorp.com/agent-inject-template-cde-env: |- + {{- with secret "secrets/data/vault/apps/cde" -}} + {{- range $k, $v := .Data.data }} + export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }}) + {{- end }} + {{- end -}} + + commitSha: "" + gitlabUri: "" + gitlabJobUrl: "" + owner: "" diff --git a/apps/cde/base/cde-worker-sign.yaml b/apps/cde/base/cde-worker-sign.yaml index 153caab..7c9fa93 100644 --- a/apps/cde/base/cde-worker-sign.yaml +++ b/apps/cde/base/cde-worker-sign.yaml @@ -42,7 +42,7 @@ spec: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/sign-worker:prod_9f3c1d2a + _default: cr.yandex/crp3ccidau046kdj8g9q/sign-worker:prod_4.5.0 pullPolicy: _default: IfNotPresent @@ -56,7 +56,7 @@ spec: _default: 1 port: - _default: 8000 + _default: 8080 command: _default: ["/bin/bash", "-lc"] @@ -70,9 +70,9 @@ spec: resources: requests: cpu: - _default: 25m + _default: "2" memory: - _default: 128Mi + _default: 4Gi probes: liveness: @@ -89,11 +89,6 @@ spec: name: _default: regcred - envs: - - name: S3_IS_CONTOUR - value: - _default: "true" - podAnnotations: _default: traffic.sidecar.istio.io/excludeOutboundPorts: "8200" diff --git a/apps/cde/base/cde-worker-signv2.yaml b/apps/cde/base/cde-worker-signv2.yaml new file mode 100644 index 0000000..1d8cafb --- /dev/null +++ b/apps/cde/base/cde-worker-signv2.yaml @@ -0,0 +1,111 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: cde-worker-signv2 + namespace: cde + +spec: + interval: 10m + + chart: + spec: + chart: universal-chart + version: "0.1.9" + sourceRef: + kind: HelmRepository + name: yc-oci-charts + namespace: flux-system + interval: 10m + + install: + remediation: + retries: 3 + + upgrade: + remediation: + retries: 3 + + values: + global: + env: _default + + services: + cde-worker-signv2: + enabled: true + + serviceAccount: + enabled: + _default: true + name: + _default: cde-vault + + image: + name: + _default: cr.yandex/crp3ccidau046kdj8g9q/signv2-worker:prod_4.5.0 + pullPolicy: + _default: IfNotPresent + + deployment: + enabled: true + + name: + _default: cde-worker-signv2 + + replicaCount: + _default: 1 + + port: + _default: 8080 + + command: + _default: ["/bin/bash", "-lc"] + args: + _default: + - | + set -e + source /vault/secrets/cde-env + exec /worker + + resources: + requests: + cpu: + _default: "2" + memory: + _default: 4Gi + + probes: + liveness: + enabled: false + readiness: + enabled: false + + service: + enabled: false + + imagePullSecrets: + enabled: + _default: true + name: + _default: regcred + + podAnnotations: + _default: + traffic.sidecar.istio.io/excludeOutboundPorts: "8200" + vault.hashicorp.com/agent-init-first: "true" + vault.hashicorp.com/agent-inject: "true" + vault.hashicorp.com/agent-pre-populate-only: "true" + vault.hashicorp.com/auth-path: auth/kubernetes + vault.hashicorp.com/role: cde + vault.hashicorp.com/agent-inject-secret-cde-env: secrets/data/vault/apps/cde + vault.hashicorp.com/agent-inject-template-cde-env: |- + {{- with secret "secrets/data/vault/apps/cde" -}} + {{- range $k, $v := .Data.data }} + export {{ $k }}=$(printf '%b' {{ printf "%q" (printf "%v" $v) }}) + {{- end }} + {{- end -}} + + commitSha: "" + gitlabUri: "" + gitlabJobUrl: "" + owner: "" diff --git a/apps/cde/base/cde-worker-update-bundles.yaml b/apps/cde/base/cde-worker-update-bundles.yaml index 0edcf5b..a71d510 100644 --- a/apps/cde/base/cde-worker-update-bundles.yaml +++ b/apps/cde/base/cde-worker-update-bundles.yaml @@ -42,7 +42,7 @@ spec: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/updatebundles-worker:prod_9f3c1d2a + _default: cr.yandex/crp3ccidau046kdj8g9q/updatebundles-worker:prod_4.5.0 pullPolicy: _default: IfNotPresent @@ -56,7 +56,7 @@ spec: _default: 1 port: - _default: 8000 + _default: 8080 command: _default: ["/bin/bash", "-lc"] @@ -70,9 +70,9 @@ spec: resources: requests: cpu: - _default: 25m + _default: "1" memory: - _default: 128Mi + _default: 4Gi probes: liveness: @@ -89,11 +89,6 @@ spec: name: _default: regcred - envs: - - name: S3_IS_CONTOUR - value: - _default: "true" - podAnnotations: _default: traffic.sidecar.istio.io/excludeOutboundPorts: "8200" diff --git a/apps/cde/base/cde.yaml b/apps/cde/base/cde.yaml index 1cade42..913a511 100644 --- a/apps/cde/base/cde.yaml +++ b/apps/cde/base/cde.yaml @@ -42,7 +42,7 @@ spec: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/cde:prod_9f3c1d2a + _default: cr.yandex/crp3ccidau046kdj8g9q/cde:production_54ec2a86 pullPolicy: _default: IfNotPresent @@ -56,7 +56,7 @@ spec: _default: 1 port: - _default: 8000 + _default: 8080 command: _default: ["/bin/bash", "-lc"] @@ -70,9 +70,9 @@ spec: resources: requests: cpu: - _default: 25m + _default: "2" memory: - _default: 128Mi + _default: 4Gi probes: liveness: @@ -93,7 +93,7 @@ spec: _default: 80 targetPort: - _default: 8000 + _default: 8080 portName: _default: http @@ -105,9 +105,9 @@ spec: _default: regcred envs: - - name: S3_IS_CONTOUR + - name: SAREX_BACKEND_BASE_URL value: - _default: "true" + _default: "https://lk.sarex.io" podAnnotations: _default: diff --git a/apps/cde/base/kustomization.yaml b/apps/cde/base/kustomization.yaml index 66da886..753fbe5 100644 --- a/apps/cde/base/kustomization.yaml +++ b/apps/cde/base/kustomization.yaml @@ -7,8 +7,13 @@ resources: - cde.yaml - cde-splitpdf.yaml - cde-flowscallback.yaml + - cde-worker-alert.yaml - cde-worker-copy.yaml + - cde-worker-copyv2.yaml - cde-worker-create-versions.yaml + - cde-worker-create-versionsv2.yaml - cde-worker-markings.yaml + - cde-worker-markingsv2.yaml - cde-worker-sign.yaml + - cde-worker-signv2.yaml - cde-worker-update-bundles.yaml