diff --git a/apps/control-interface/base/deployment.yaml b/apps/control-interface/base/deployment.yaml new file mode 100644 index 0000000..914db47 --- /dev/null +++ b/apps/control-interface/base/deployment.yaml @@ -0,0 +1,29 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: srx-admin + namespace: control-interface + labels: + app: srx-admin +spec: + replicas: 1 + selector: + matchLabels: + app: srx-admin + template: + metadata: + labels: + app: srx-admin + spec: + containers: + - name: srx-admin + image: cr.yandex/crp3ccidau046kdj8g9q/srx-admin:prod_3b9cb250 + imagePullPolicy: IfNotPresent + ports: + - name: http + containerPort: 80 + protocol: TCP + imagePullSecrets: + - name: regcred + diff --git a/apps/example-app/base/kustomization.yaml b/apps/control-interface/base/kustomization.yaml similarity index 76% rename from apps/example-app/base/kustomization.yaml rename to apps/control-interface/base/kustomization.yaml index c7a2dea..1abd7c3 100644 --- a/apps/example-app/base/kustomization.yaml +++ b/apps/control-interface/base/kustomization.yaml @@ -1,9 +1,8 @@ --- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: example-app +namespace: control-interface resources: - namespace.yaml - - configmap.yaml - deployment.yaml - service.yaml diff --git a/apps/control-interface/base/namespace.yaml b/apps/control-interface/base/namespace.yaml new file mode 100644 index 0000000..febf860 --- /dev/null +++ b/apps/control-interface/base/namespace.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: control-interface + labels: + istio-injection: enabled diff --git a/apps/control-interface/base/service.yaml b/apps/control-interface/base/service.yaml new file mode 100644 index 0000000..64e2bf5 --- /dev/null +++ b/apps/control-interface/base/service.yaml @@ -0,0 +1,14 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: srx-admin-svc + namespace: control-interface +spec: + type: ClusterIP + selector: + app: srx-admin + ports: + - port: 8080 + targetPort: 80 + protocol: TCP diff --git a/apps/example-app/kustomization.yaml b/apps/control-interface/yc-k8s-test/kustomization.yaml similarity index 64% rename from apps/example-app/kustomization.yaml rename to apps/control-interface/yc-k8s-test/kustomization.yaml index a73192f..5c65d7e 100644 --- a/apps/example-app/kustomization.yaml +++ b/apps/control-interface/yc-k8s-test/kustomization.yaml @@ -2,9 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ./base + - ../base patches: - - path: patches/replicas.yaml + - path: replicas.yaml target: kind: Deployment - name: example-app + name: srx-admin diff --git a/apps/control-interface/yc-k8s-test/replicas.yaml b/apps/control-interface/yc-k8s-test/replicas.yaml new file mode 100644 index 0000000..af3c901 --- /dev/null +++ b/apps/control-interface/yc-k8s-test/replicas.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: srx-admin + namespace: control-interface +spec: + replicas: 1 diff --git a/apps/cross-section/base/deployment.yaml b/apps/cross-section/base/deployment.yaml new file mode 100644 index 0000000..4b4c6d9 --- /dev/null +++ b/apps/cross-section/base/deployment.yaml @@ -0,0 +1,46 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cross-section-static + namespace: cross-section + labels: + app: cross-section-static +spec: + replicas: 2 + selector: + matchLabels: + app: cross-section-static + template: + metadata: + labels: + app: cross-section-static + spec: + containers: + - name: frontend + image: cr.yandex/crp3ccidau046kdj8g9q/cross-section-app:production_e09e648b + imagePullPolicy: IfNotPresent + ports: + - name: http + containerPort: 80 + protocol: TCP + livenessProbe: + httpGet: + path: /ping + port: 80 + initialDelaySeconds: 10 + periodSeconds: 10 + failureThreshold: 10 + readinessProbe: + httpGet: + path: /ping + port: 80 + initialDelaySeconds: 10 + periodSeconds: 10 + failureThreshold: 20 + resources: + requests: + cpu: 100m + memory: 100Mi + imagePullSecrets: + - name: regcred diff --git a/apps/cross-section/base/kustomization.yaml b/apps/cross-section/base/kustomization.yaml new file mode 100644 index 0000000..eabd449 --- /dev/null +++ b/apps/cross-section/base/kustomization.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: cross-section +resources: + - namespace.yaml + - deployment.yaml + - service.yaml diff --git a/apps/cross-section/base/namespace.yaml b/apps/cross-section/base/namespace.yaml new file mode 100644 index 0000000..ac9376b --- /dev/null +++ b/apps/cross-section/base/namespace.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: cross-section + labels: + istio-injection: enabled diff --git a/apps/cross-section/base/service.yaml b/apps/cross-section/base/service.yaml new file mode 100644 index 0000000..555507e --- /dev/null +++ b/apps/cross-section/base/service.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: cross-section-static + namespace: cross-section +spec: + type: ClusterIP + selector: + app: cross-section-static + ports: + - name: http + port: 80 + targetPort: 80 + protocol: TCP diff --git a/apps/cross-section/yc-k8s-test/kustomization.yaml b/apps/cross-section/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..141572c --- /dev/null +++ b/apps/cross-section/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: cross-section-static diff --git a/apps/cross-section/yc-k8s-test/replicas.yaml b/apps/cross-section/yc-k8s-test/replicas.yaml new file mode 100644 index 0000000..eff7632 --- /dev/null +++ b/apps/cross-section/yc-k8s-test/replicas.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cross-section-static + namespace: cross-section +spec: + replicas: 1 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/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/projects/base/kustomization.yaml b/apps/projects/base/kustomization.yaml new file mode 100644 index 0000000..2362307 --- /dev/null +++ b/apps/projects/base/kustomization.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: projects +resources: + - namespace.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/apps/reviews/base/deployment.yaml b/apps/reviews/base/deployment.yaml new file mode 100644 index 0000000..49939f0 --- /dev/null +++ b/apps/reviews/base/deployment.yaml @@ -0,0 +1,33 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: frontend + namespace: reviews + labels: + app: frontend +spec: + replicas: 1 + selector: + matchLabels: + app: frontend + template: + metadata: + labels: + app: frontend + version: stable + spec: + containers: + - name: frontend + image: cr.yandex/crp3ccidau046kdj8g9q/reviews-frontend:contour_3a66be35 + imagePullPolicy: IfNotPresent + ports: + - name: http + containerPort: 80 + protocol: TCP + resources: + requests: + cpu: 100m + memory: 100Mi + imagePullSecrets: + - name: regcred diff --git a/apps/kustomization.yaml b/apps/reviews/base/kustomization.yaml similarity index 51% rename from apps/kustomization.yaml rename to apps/reviews/base/kustomization.yaml index 403cb3d..aa3ce06 100644 --- a/apps/kustomization.yaml +++ b/apps/reviews/base/kustomization.yaml @@ -1,5 +1,8 @@ --- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: reviews resources: - - example-app + - namespace.yaml + - deployment.yaml + - service.yaml diff --git a/apps/reviews/base/namespace.yaml b/apps/reviews/base/namespace.yaml new file mode 100644 index 0000000..91dc1be --- /dev/null +++ b/apps/reviews/base/namespace.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: reviews + labels: + istio-injection: enabled \ No newline at end of file diff --git a/apps/reviews/base/service.yaml b/apps/reviews/base/service.yaml new file mode 100644 index 0000000..1e0c511 --- /dev/null +++ b/apps/reviews/base/service.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: frontend-service + namespace: reviews +spec: + type: ClusterIP + selector: + app: frontend + ports: + - name: http + port: 80 + targetPort: 80 + protocol: TCP diff --git a/apps/reviews/yc-k8s-test/kustomization.yaml b/apps/reviews/yc-k8s-test/kustomization.yaml new file mode 100644 index 0000000..85195ca --- /dev/null +++ b/apps/reviews/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: frontend diff --git a/apps/reviews/yc-k8s-test/replicas.yaml b/apps/reviews/yc-k8s-test/replicas.yaml new file mode 100644 index 0000000..075b22d --- /dev/null +++ b/apps/reviews/yc-k8s-test/replicas.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: frontend + namespace: reviews +spec: + replicas: 1 diff --git a/clusters/yc-k8s-test/kustomization.yaml b/clusters/yc-k8s-test/kustomization.yaml index a8384a3..5764ef1 100644 --- a/clusters/yc-k8s-test/kustomization.yaml +++ b/clusters/yc-k8s-test/kustomization.yaml @@ -4,3 +4,9 @@ resources: - ./flux-system - ./helm-repositories.yaml - ./infrastructure + +# apps + - ../../apps/reviews/yc-k8s-test + - ../../apps/projects/yc-k8s-test + - ../../apps/control-interface/yc-k8s-test + - ../../apps/cross-section/yc-k8s-test \ No newline at end of file