diff --git a/infra/kube/helm/templates/deployment-backend.yaml b/infra/kube/helm/templates/deployment-backend.yaml index e29e113c..6a11d4e2 100644 --- a/infra/kube/helm/templates/deployment-backend.yaml +++ b/infra/kube/helm/templates/deployment-backend.yaml @@ -25,14 +25,12 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} serviceAccountName: {{ include "basegun.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.backend.podSecurityContext | nindent 8 }} + securityContext: {} containers: - name: {{ include "basegun.BackFullname" . }} - securityContext: - {{- toYaml .Values.backend.securityContext | nindent 12 }} + securityContext: {} image: "{{ .Values.backend.image.repository }}:{{ .Values.backend.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.backend.image.pullPolicy }} + imagePullPolicy: Always resources: {{- toYaml .Values.backend.resources | nindent 12 }} envFrom: - configMapRef: @@ -95,16 +93,3 @@ spec: secretName: {{ .Values.backend.secret.secretName }} - name: logs emptyDir: {} - - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.backend.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.backend.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/infra/kube/helm/templates/deployment-frontend.yaml b/infra/kube/helm/templates/deployment-frontend.yaml index 7b2dc468..99457f3d 100644 --- a/infra/kube/helm/templates/deployment-frontend.yaml +++ b/infra/kube/helm/templates/deployment-frontend.yaml @@ -23,14 +23,12 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} serviceAccountName: {{ include "basegun.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.frontend.podSecurityContext | nindent 8 }} + securityContext: {} containers: - name: {{ include "basegun.FrontFullname" . }} - securityContext: - {{- toYaml .Values.frontend.securityContext | nindent 12 }} + securityContext: {} image: "{{ .Values.frontend.image.repository }}:{{ .Values.frontend.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.frontend.image.pullPolicy }} + imagePullPolicy: Always resources: {{- toYaml .Values.frontend.resources | nindent 12 }} ports: - name: http @@ -46,15 +44,3 @@ spec: httpGet: path: / port: http - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.frontend.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.frontend.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/infra/kube/helm/values-dso.yaml b/infra/kube/helm/values-dso.yaml index 05e0ff32..4a806b9e 100644 --- a/infra/kube/helm/values-dso.yaml +++ b/infra/kube/helm/values-dso.yaml @@ -1,52 +1,26 @@ -# Default values for basegun. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - nameOverride: "" fullnameOverride: "" ingress: enabled: true className: "" - #annotations: - #traefik.ingress.kubernetes.io/router.tls: "true" - #traefik.ingress.kubernetes.io/router.tls.certresolver: letsencrypt hosts: - host: basegun.dev.numerique-interieur.com paths: - path: / pathType: Prefix tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local serviceAccount: - # Specifies whether a service account should be created create: true - # Annotations to add to the service account annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template name: "" imagePullSecrets: - name: registry-pull-secret -# Config for backend backend: replicaCount: 1 image: repository: harbor.apps.c6.numerique-interieur.com/mi-basegun-test/basegun-backend - pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. tag: develop podAnnotations: {} - podSecurityContext: {} - # fsGroup: 2000 - securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 logs: repository: ghcr.io/datalab-mi/basegun/filebeat-rootless tag: 6.5.4 @@ -60,18 +34,12 @@ backend: minReplicas: 1 maxReplicas: 10 targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 config: - # Used for showing current workspace in app workspace: preprod secret: create: false sops: true secretName: basegun-preprod-secret - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. resources: limits: cpu: 2500m @@ -79,44 +47,15 @@ backend: requests: cpu: 100m memory: 512Mi - nodeSelector: {} - tolerations: [] - affinity: {} -# Config for frontend frontend: replicaCount: 1 image: repository: harbor.apps.c6.numerique-interieur.com/mi-basegun-test/basegun-frontend pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. tag: develop podAnnotations: {} - podSecurityContext: {} - # fsGroup: 2000 - - securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - service: type: ClusterIP port: 8080 containerPort: 8080 - resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - nodeSelector: {} - tolerations: [] - affinity: {} + resources: {} \ No newline at end of file diff --git a/infra/kube/helm/values.yaml b/infra/kube/helm/values.yaml index 1db7666e..7f5c3723 100644 --- a/infra/kube/helm/values.yaml +++ b/infra/kube/helm/values.yaml @@ -1,52 +1,27 @@ -# Default values for basegun. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - nameOverride: "" fullnameOverride: "" env: dev ingress: enabled: true className: "" - #annotations: - #traefik.ingress.kubernetes.io/router.tls: "true" - #traefik.ingress.kubernetes.io/router.tls.certresolver: letsencrypt hosts: - host: basegun.fr paths: - path: / pathType: Prefix tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local serviceAccount: - # Specifies whether a service account should be created create: true - # Annotations to add to the service account annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template name: "" -# Config for backend backend: replicaCount: 1 image: repository: ghcr.io/datalab-mi/basegun/basegun-backend pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. tag: "3.2" imagePullSecrets: [] podAnnotations: {} - podSecurityContext: {} - # fsGroup: 2000 - securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 logs: repository: elastic/filebeat tag: 6.5.4 @@ -67,64 +42,35 @@ backend: minReplicas: 1 maxReplicas: 10 targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 config: - # Used for showing current workspace in app workspace: preprod secret: create: false sops: false secretName: basegun-secret resources: - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. limits: cpu: 250m memory: 1Gi requests: cpu: 100m memory: 512Mi - nodeSelector: {} - tolerations: [] - affinity: {} -# Config for frontend frontend: replicaCount: 1 image: repository: ghcr.io/datalab-mi/basegun/basegun-frontend pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. tag: "3.2" imagePullSecrets: [] podAnnotations: {} - podSecurityContext: {} - # fsGroup: 2000 - - securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - service: type: ClusterIP port: 80 containerPort: 8080 resources: - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. limits: cpu: 200m memory: 256Mi requests: cpu: 50m memory: 64Mi - nodeSelector: {} - tolerations: [] - affinity: {}