From 00708f1853beac4ef0c41c7d569d658ef4955fc8 Mon Sep 17 00:00:00 2001 From: emelinda Date: Mon, 13 Apr 2026 11:45:53 +0300 Subject: [PATCH] Add projects app base configuration and yc-k8s-test overlay with Kustomization files --- apps/example-app/base/configmap.yaml | 9 ---- apps/example-app/base/deployment.yaml | 47 ------------------- apps/example-app/base/namespace.yaml | 5 -- apps/example-app/base/service.yaml | 17 ------- apps/example-app/kustomization.yaml | 10 ---- apps/example-app/patches/replicas.yaml | 9 ---- apps/projects/base/deployment.yaml | 46 ++++++++++++++++++ .../base/kustomization.yaml | 7 ++- apps/projects/base/namespace.yaml | 7 +++ apps/projects/base/service.yaml | 15 ++++++ apps/projects/yc-k8s-test/kustomization.yaml | 10 ++++ apps/projects/yc-k8s-test/replicas.yaml | 8 ++++ clusters/yc-k8s-test/kustomization.yaml | 3 +- 13 files changed, 91 insertions(+), 102 deletions(-) delete mode 100644 apps/example-app/base/configmap.yaml delete mode 100644 apps/example-app/base/deployment.yaml delete mode 100644 apps/example-app/base/namespace.yaml delete mode 100644 apps/example-app/base/service.yaml delete mode 100644 apps/example-app/kustomization.yaml delete mode 100644 apps/example-app/patches/replicas.yaml create mode 100644 apps/projects/base/deployment.yaml rename apps/{example-app => projects}/base/kustomization.yaml (55%) create mode 100644 apps/projects/base/namespace.yaml create mode 100644 apps/projects/base/service.yaml create mode 100644 apps/projects/yc-k8s-test/kustomization.yaml create mode 100644 apps/projects/yc-k8s-test/replicas.yaml diff --git a/apps/example-app/base/configmap.yaml b/apps/example-app/base/configmap.yaml deleted file mode 100644 index 490fd1c..0000000 --- a/apps/example-app/base/configmap.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: example-app-config - namespace: example-app -data: - APP_ENV: "production" - LOG_LEVEL: "info" diff --git a/apps/example-app/base/deployment.yaml b/apps/example-app/base/deployment.yaml deleted file mode 100644 index f8087aa..0000000 --- a/apps/example-app/base/deployment.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-app - namespace: example-app - labels: - app.kubernetes.io/name: example-app -spec: - replicas: 1 - selector: - matchLabels: - app.kubernetes.io/name: example-app - template: - metadata: - labels: - app.kubernetes.io/name: example-app - spec: - containers: - - name: example-app - image: nginx:1.27-alpine - ports: - - name: http - containerPort: 80 - protocol: TCP - envFrom: - - configMapRef: - name: example-app-config - resources: - requests: - cpu: 50m - memory: 64Mi - limits: - cpu: 200m - memory: 128Mi - livenessProbe: - httpGet: - path: / - port: http - initialDelaySeconds: 5 - periodSeconds: 10 - readinessProbe: - httpGet: - path: / - port: http - initialDelaySeconds: 5 - periodSeconds: 10 diff --git a/apps/example-app/base/namespace.yaml b/apps/example-app/base/namespace.yaml deleted file mode 100644 index 879e7fb..0000000 --- a/apps/example-app/base/namespace.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: example-app diff --git a/apps/example-app/base/service.yaml b/apps/example-app/base/service.yaml deleted file mode 100644 index feec4ee..0000000 --- a/apps/example-app/base/service.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: example-app - namespace: example-app - labels: - app.kubernetes.io/name: example-app -spec: - type: ClusterIP - selector: - app.kubernetes.io/name: example-app - ports: - - name: http - port: 80 - targetPort: http - protocol: TCP diff --git a/apps/example-app/kustomization.yaml b/apps/example-app/kustomization.yaml deleted file mode 100644 index a73192f..0000000 --- a/apps/example-app/kustomization.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ./base -patches: - - path: patches/replicas.yaml - target: - kind: Deployment - name: example-app diff --git a/apps/example-app/patches/replicas.yaml b/apps/example-app/patches/replicas.yaml deleted file mode 100644 index 1acf757..0000000 --- a/apps/example-app/patches/replicas.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# Переопределения для example-app на кластере contour -apiVersion: apps/v1 -kind: Deployment -metadata: - name: example-app - namespace: example-app -spec: - replicas: 2 diff --git a/apps/projects/base/deployment.yaml b/apps/projects/base/deployment.yaml new file mode 100644 index 0000000..bd1ae7b --- /dev/null +++ b/apps/projects/base/deployment.yaml @@ -0,0 +1,46 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: projects-frontend-static + namespace: projects + labels: + app: projects-frontend-static +spec: + replicas: 2 + selector: + matchLabels: + app: projects-frontend-static + template: + metadata: + labels: + app: projects-frontend-static + spec: + containers: + - name: projects-frontend-static + image: cr.yandex/crp3ccidau046kdj8g9q/project-frontend-app:wb_fd49eb19 + imagePullPolicy: IfNotPresent + ports: + - name: http + containerPort: 80 + protocol: TCP + livenessProbe: + httpGet: + path: /ping + port: 80 + initialDelaySeconds: 10 + periodSeconds: 60 + failureThreshold: 10 + readinessProbe: + httpGet: + path: /ping + port: 80 + initialDelaySeconds: 10 + periodSeconds: 30 + failureThreshold: 20 + resources: + requests: + cpu: 100m + memory: 100Mi + imagePullSecrets: + - name: regcred diff --git a/apps/example-app/base/kustomization.yaml b/apps/projects/base/kustomization.yaml similarity index 55% rename from apps/example-app/base/kustomization.yaml rename to apps/projects/base/kustomization.yaml index c7a2dea..eae563e 100644 --- a/apps/example-app/base/kustomization.yaml +++ b/apps/projects/base/kustomization.yaml @@ -1,9 +1,8 @@ --- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: example-app +namespace: projects resources: - namespace.yaml - - configmap.yaml - - deployment.yaml - - service.yaml +# - deployment.yaml +# - service.yaml diff --git a/apps/projects/base/namespace.yaml b/apps/projects/base/namespace.yaml new file mode 100644 index 0000000..05ce0dc --- /dev/null +++ b/apps/projects/base/namespace.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: projects + labels: + istio-injection: enabled diff --git a/apps/projects/base/service.yaml b/apps/projects/base/service.yaml new file mode 100644 index 0000000..5abbc82 --- /dev/null +++ b/apps/projects/base/service.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: projects-frontend-static-service + namespace: projects +spec: + type: ClusterIP + selector: + app: projects-frontend-static + ports: + - name: http + port: 80 + targetPort: 80 + protocol: TCP diff --git a/apps/projects/yc-k8s-test/kustomization.yaml b/apps/projects/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..201a72f --- /dev/null +++ b/apps/projects/yc-k8s-test/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: [] +# - path: replicas.yaml +# target: +# kind: Deployment +# name: projects-frontend-static diff --git a/apps/projects/yc-k8s-test/replicas.yaml b/apps/projects/yc-k8s-test/replicas.yaml new file mode 100644 index 0000000..b5c3c0a --- /dev/null +++ b/apps/projects/yc-k8s-test/replicas.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: projects-frontend-static + namespace: projects +spec: + replicas: 2 diff --git a/clusters/yc-k8s-test/kustomization.yaml b/clusters/yc-k8s-test/kustomization.yaml index e48d38d..efc2dd8 100644 --- a/clusters/yc-k8s-test/kustomization.yaml +++ b/clusters/yc-k8s-test/kustomization.yaml @@ -6,4 +6,5 @@ resources: - ./infrastructure # apps - - ../../apps/reviews/yc-k8s-test \ No newline at end of file + - ../../apps/reviews/yc-k8s-test + - ../../apps/projects/yc-k8s-test \ No newline at end of file