diff --git a/apps/reviews/base/deployment.yaml b/apps/reviews/base/deployment.yaml deleted file mode 100644 index c61bcde..0000000 --- a/apps/reviews/base/deployment.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -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: 25m - memory: 100Mi - imagePullSecrets: - - name: regcred diff --git a/apps/reviews/base/helmrelease.yaml b/apps/reviews/base/helmrelease.yaml new file mode 100644 index 0000000..4f8c42e --- /dev/null +++ b/apps/reviews/base/helmrelease.yaml @@ -0,0 +1,94 @@ +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: frontend + namespace: reviews + +spec: + interval: 10m + + chart: + spec: + chart: universal-chart + version: "0.1.7" + 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: + frontend: + enabled: true + + image: + name: + _default: cr.yandex/crp3ccidau046kdj8g9q/reviews-frontend:contour_3a66be35 + pullPolicy: + _default: IfNotPresent + + deployment: + enabled: true + + name: + _default: frontend + + replicaCount: + _default: 1 + + port: + _default: 80 + + resources: + requests: + cpu: + _default: 25m + memory: + _default: 100Mi + + probes: + liveness: + enabled: false + readiness: + enabled: false + + service: + enabled: true + + name: + _default: frontend-svc + + type: + _default: ClusterIP + + port: + _default: 80 + + targetPort: + _default: 80 + + portName: + _default: http + + imagePullSecrets: + enabled: + _default: true + name: + _default: regcred + + commitSha: "" + gitlabUri: "" + gitlabJobUrl: "" + owner: "" diff --git a/apps/reviews/base/kustomization.yaml b/apps/reviews/base/kustomization.yaml index aa3ce06..1b95173 100644 --- a/apps/reviews/base/kustomization.yaml +++ b/apps/reviews/base/kustomization.yaml @@ -4,5 +4,4 @@ kind: Kustomization namespace: reviews resources: - namespace.yaml - - deployment.yaml - - service.yaml + - helmrelease.yaml diff --git a/apps/reviews/base/service.yaml b/apps/reviews/base/service.yaml deleted file mode 100644 index 9acd592..0000000 --- a/apps/reviews/base/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: frontend-svc - namespace: reviews -spec: - type: ClusterIP - selector: - app: frontend - ports: - - name: http - port: 80 - targetPort: 80 - protocol: TCP diff --git a/apps/reviews/d8-ugmk-prod/kustomization.yaml b/apps/reviews/d8-ugmk-prod/kustomization.yaml new file mode 100644 index 0000000..27bbc60 --- /dev/null +++ b/apps/reviews/d8-ugmk-prod/kustomization.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base +patches: + - path: namespace.yaml + target: + kind: Namespace + name: reviews diff --git a/apps/reviews/d8-ugmk-prod/namespace.yaml b/apps/reviews/d8-ugmk-prod/namespace.yaml new file mode 100644 index 0000000..721a28c --- /dev/null +++ b/apps/reviews/d8-ugmk-prod/namespace.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: reviews + labels: + istio-injection: disabled + security.deckhouse.io/pod-policy: privileged diff --git a/apps/reviews/yc-k8s-test/kustomization.yaml b/apps/reviews/yc-k8s-test/kustomization.yaml index 85195ca..037075a 100644 --- a/apps/reviews/yc-k8s-test/kustomization.yaml +++ b/apps/reviews/yc-k8s-test/kustomization.yaml @@ -6,5 +6,5 @@ resources: patches: [] # - path: replicas.yaml # target: -# kind: Deployment +# kind: HelmRelease # name: frontend diff --git a/apps/reviews/yc-k8s-test/replicas.yaml b/apps/reviews/yc-k8s-test/replicas.yaml index 075b22d..32e64ea 100644 --- a/apps/reviews/yc-k8s-test/replicas.yaml +++ b/apps/reviews/yc-k8s-test/replicas.yaml @@ -1,8 +1,13 @@ --- -apiVersion: apps/v1 -kind: Deployment +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease metadata: name: frontend namespace: reviews spec: - replicas: 1 + values: + services: + frontend: + deployment: + replicaCount: + _default: 1 diff --git a/clusters/d8-ugmk-prod/kustomization.yaml b/clusters/d8-ugmk-prod/kustomization.yaml index 7a66551..9e9e3dc 100644 --- a/clusters/d8-ugmk-prod/kustomization.yaml +++ b/clusters/d8-ugmk-prod/kustomization.yaml @@ -19,4 +19,5 @@ resources: # apps - ../../apps/attachments/d8-ugmk-prod - ../../apps/control-interface/d8-ugmk-prod - - ../../apps/cross-section/d8-ugmk-prod \ No newline at end of file + - ../../apps/cross-section/d8-ugmk-prod + - ../../apps/reviews/d8-ugmk-prod \ No newline at end of file