From 763852e5be009e78e2f588c8465fd6b62e6b8fa2 Mon Sep 17 00:00:00 2001 From: almog8k Date: Tue, 26 Mar 2024 11:24:13 +0200 Subject: [PATCH] fix: EOF warn, adding empty values when needed --- .github/workflows/build_and_push.yaml | 3 +- .github/workflows/pull_request.yaml | 3 +- .github/workflows/release-on-tag-push.yaml | 3 +- helm/output | 127 +++++++++++++++++++++ helm/templates/_resources.tpl | 2 +- helm/values.yaml | 10 +- output | 0 7 files changed, 138 insertions(+), 10 deletions(-) create mode 100644 helm/output create mode 100644 output diff --git a/.github/workflows/build_and_push.yaml b/.github/workflows/build_and_push.yaml index 00607a6..466211e 100644 --- a/.github/workflows/build_and_push.yaml +++ b/.github/workflows/build_and_push.yaml @@ -24,4 +24,5 @@ jobs: build_and_push_helm: uses: MapColonies/shared-workflows/.github/workflows/build-and-push-helm.yaml@master - secrets: inherit \ No newline at end of file + secrets: inherit + \ No newline at end of file diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index db45fd6..7ee33f7 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -5,4 +5,5 @@ on: [pull_request] jobs: pull_request: uses: MapColonies/shared-workflows/.github/workflows/pull_request.yaml@master - secrets: inherit \ No newline at end of file + secrets: inherit + \ No newline at end of file diff --git a/.github/workflows/release-on-tag-push.yaml b/.github/workflows/release-on-tag-push.yaml index 4a51850..29eedcd 100644 --- a/.github/workflows/release-on-tag-push.yaml +++ b/.github/workflows/release-on-tag-push.yaml @@ -8,4 +8,5 @@ on: jobs: release_on_tag_push: uses: MapColonies/shared-workflows/.github/workflows/release-on-tag-push.yaml@master - secrets: inherit \ No newline at end of file + secrets: inherit + \ No newline at end of file diff --git a/helm/output b/helm/output new file mode 100644 index 0000000..9337bd5 --- /dev/null +++ b/helm/output @@ -0,0 +1,127 @@ +--- +# Source: job-manager/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: 123-job-manager-configmap +data: + LOG_LEVEL: "warn" + REQUEST_PAYLOAD_LIMIT: "10mb" + RESPONSE_COMPRESSION_ENABLED: "true" + LOG_PRETTY_PRINT_ENABLED: "false" + DB_HOST: "localhost" + DB_PORT: "5432" + DB_NAME: "common" + DB_SCHEMA: "" + DB_LOGGING: "false" + DB_SSL_ENABLE: "false" + PGAPPNAME: job-manager +--- +# Source: job-manager/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: 123-job-manager-service + labels: + app: job-manager + component: job-manager + environment: development + release: 123 + helm.sh/chart: job-manager-2.5.0 + app.kubernetes.io/name: job-manager + app.kubernetes.io/instance: 123 + app.kubernetes.io/version: "2.5.0" + app.kubernetes.io/managed-by: Helm +spec: + ports: + - port: 80 + targetPort: 8080 + protocol: "TCP" + name: http + selector: + app: job-manager + release: 123 + run: 123-job-manager + app.kubernetes.io/name: job-manager + app.kubernetes.io/instance: 123 +--- +# Source: job-manager/templates/deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: 123-job-manager-deployment + labels: + app: job-manager + component: job-manager + environment: development + release: 123 + helm.sh/chart: job-manager-2.5.0 + app.kubernetes.io/name: job-manager + app.kubernetes.io/instance: 123 + app.kubernetes.io/version: "2.5.0" + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + selector: + matchLabels: + app: job-manager + release: 123 + run: 123-job-manager + app.kubernetes.io/name: job-manager + app.kubernetes.io/instance: 123 + template: + metadata: + labels: + app: job-manager + release: 123 + run: 123-job-manager + app.kubernetes.io/name: job-manager + app.kubernetes.io/instance: 123 + annotations: + checksum/configmap: 981f286c01ae4b84ffb391fc678efc6afed3b37b981189333583fbd435c0c750 + spec: + containers: + - name: 123 + image: my-registry-url.io/job-manager:latest + env: + - name: SERVER_PORT + value: "8080" + - name: DB_USER + valueFrom: + secretKeyRef: + name: 123-postgres-secret + key: username + - name: DB_PASSWORD + valueFrom: + secretKeyRef: + name: 123-postgres-secret + key: password + - name: DB_SSL_ENABLE + value: "false" + - name: DB_SSL_CA + value: "/opt/certs/ca/ca.pem" + - name: DB_SSL_KEY + value: "/opt/certs/key/key.pem" + - name: DB_SSL_CERT + value: "/opt/certs/cert/cert.pem" + envFrom: + - configMapRef: + name: 123-job-manager-configmap + ports: + - name: http + containerPort: 8080 + protocol: "TCP" + livenessProbe: + initialDelaySeconds: 60 + httpGet: + path: /liveness + port: 8080 + volumeMounts: + resources: + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi + volumes: diff --git a/helm/templates/_resources.tpl b/helm/templates/_resources.tpl index 6d19dc8..c5e6323 100644 --- a/helm/templates/_resources.tpl +++ b/helm/templates/_resources.tpl @@ -31,4 +31,4 @@ Create ingress name as used by the service name label. */}} {{- define "ingress.fullname" -}} {{- printf "%s-%s-%s" .Release.Name .Chart.Name "ingress" | indent 1 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/values.yaml b/helm/values.yaml index f8213d0..d4d1ad0 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -43,15 +43,13 @@ authentication: externalSecretName: "" db: - host: "localhost" - name: "common" + host: "" + name: "" port: 5432 - schema: "JobManager" + schema: "" sslEnabled: false logging: false - secrets: - useExternal: false - externalSecretName: '' + # ==================================================================================================== diff --git a/output b/output new file mode 100644 index 0000000..e69de29