@codefresh-io/kube-integration 1.26.2 → 1.26.4-test16

package/.deploy/kube-integration/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

package/.deploy/kube-integration/Chart.yaml

@@ -1,15 +1,18 @@
-apiVersion: v1
-description: Codefresh API Engine
+apiVersion: v2
+description: Helm Chart for Kube Integration
 name: kube-integration
-version: 0.0.4
+version: 1.0.0
 keywords:
 - codefresh
-- kubernetes
 - kube-integration
 home: https://codefresh.io/
 icon: https://avatars1.githubusercontent.com/u/11412079?v=3
 sources:
 - https://github.com/codefresh-io/kube-integration
 maintainers:
-- name: Alexei Ledenev
-  email: alexei@codefresh.io
+  - name: codefresh
+    url: https://codefresh-io.github.io/
+dependencies:
+  - name: cf-common
+    repository: https://chartmuseum.codefresh.io/cf-common
+    version: "0.12.0"

package/.deploy/kube-integration/templates/controller.yaml

@@ -0,0 +1,2 @@
+{{- $templateName := printf "cf-common-%s.controller" (index .Subcharts "cf-common").Chart.Version -}}
+{{- include $templateName . -}}

package/.deploy/kube-integration/templates/hpa.yaml

@@ -1,24 +1,2 @@
-{{- if .Values.hpa.enabled }}
-apiVersion: autoscaling/v2beta2
-kind: HorizontalPodAutoscaler
-metadata:
-  name:  {{ template "kube-integration.fullname" . }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ template "kube-integration.fullname" . }}-{{ .version | default "base" }}
-  minReplicas: {{ .Values.hpa.minReplicas }}
-  maxReplicas: {{ .Values.hpa.maxReplicas }}
-  metrics:
-{{- if .Values.hpa.metrics }}
-{{ toYaml .Values.hpa.metrics | indent 4 }}
-{{- else }}
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.hpa.targetCPU }}
-{{- end }}
-{{- end }}
+{{- $templateName := printf "cf-common-%s.hpa" (index .Subcharts "cf-common").Chart.Version -}}
+{{- include $templateName . -}}

package/.deploy/kube-integration/templates/pdb.yaml

@@ -1,21 +1,2 @@
-{{- if index .Values.pdb.enabled -}}
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  name: {{ template "kube-integration.fullname" . }}
-  labels:
-    app: {{ template "kube-integration.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-spec:
-  {{- if .Values.pdb.minAvailable }}
-  minAvailable: {{ .Values.pdb.minAvailable }}
-  {{- end }}
-  {{- if .Values.pdb.maxUnavailable }}
-  maxUnavailable: {{ .Values.pdb.maxUnavailable }}
-  {{- end }}
-  selector:
-    matchLabels:
-      app: {{ template "kube-integration.fullname" . }}
-{{- end -}}
+{{- $templateName := printf "cf-common-%s.pdb" (index .Subcharts "cf-common").Chart.Version -}}
+{{- include $templateName . -}}

package/.deploy/kube-integration/templates/secret.yaml

@@ -0,0 +1,2 @@
+{{- $templateName := printf "cf-common-%s.secrets" (index .Subcharts "cf-common").Chart.Version -}}
+{{- include $templateName . -}}

package/.deploy/kube-integration/templates/service.yaml

@@ -1,20 +1,2 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "kube-integration.fullname" . }}
-  labels:
-    app: {{ template "kube-integration.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    release: {{ .Release.Name  | quote }}
-    heritage: {{ .Release.Service  | quote }}
-    version: {{ .Values.imageTag | quote }}
-spec:
-  type: {{ default "ClusterIP" .Values.serviceType | quote }}
-  ports:
-  - name: "http"
-    port: {{ .Values.port }}
-    protocol: TCP
-    targetPort: {{ .Values.targetPort }}
-  selector:
-    app: {{ template "kube-integration.fullname" . }}
-
+{{- $templateName := printf "cf-common-%s.service" (index .Subcharts "cf-common").Chart.Version -}}
+{{- include $templateName . -}}

package/.deploy/kube-integration/values.yaml

@@ -1,62 +1,219 @@
+## See full values structure at https://github.com/codefresh-io/helm-charts/blob/master/charts/cf-common/values.yaml
+#-----------------------------------------------------------------------------------------------------------------------
+# GLOBAL VALUES
+#-----------------------------------------------------------------------------------------------------------------------
 global:
-  # global codefresh chart name; all subcharts use this name to access secrets and configmaps
-  codefresh: codefresh
+  imageRegistry: ""
 
-podSecurityContext:
-  runAsNonRoot: true
-  runAsGroup: 0
-  fsGroup: 0
-  runAsUser: 1000
-imagePullPolicy: Always
+  # Backward compatibility with values/templates in cf-helm
+  # These values are defined in cf-helm `values.yaml/secrets.yaml`. But listing them here for verbosity.
+  agent: null # unknown
+  codefresh: codefresh   # On-prem chart name (all subcharts use this name to access secrets and configmaps)
+  kubeIntegrationPort: 9000
+  kubeIntegrationService: kube-integration
+  newrelicLicenseKey: ""
+  postgresDatabase: ""
+  postgresHostname: ""
+  postgresHostnameSecretKeyRef: {}
+  postgresPassword: ""
+  postgresPasswordSecretKeyRef: {}
+  postgresPort: ""
+  postgresUser: ""
+  postgresUserSecretKeyRef: {}
+  rabbitmqHostname: ""
+  rabbitmqHostnameSecretKeyRef: {}
+  rabbitmqPassword: ""
+  rabbitmqPasswordSecretKeyRef: {}
+  rabbitmqProtocol: ""
+  rabbitmqUsername: ""
+  rabbitmqUsernameSecretKeyRef: {}
 
-# Number of replicas
-replicaCount: 1
-redeploy: false
+#-----------------------------------------------------------------------------------------------------------------------
+# LOCAL VALUES
+#-----------------------------------------------------------------------------------------------------------------------
 
-image: codefresh-inc/codefresh/kube-integration
-imageTag: master
-dockerRegistry: 839151377425.dkr.ecr.us-east-1.amazonaws.com/
+postgresDatabase: ""
+postgresHostname: ""
+postgresHostnameSecretKeyRef: {}
+postgresPassword: ""
+postgresPasswordSecretKeyRef: {}
+postgresPort: ""
+postgresUser: ""
+postgresUserSecretKeyRef: {}
+rabbitmqHostname: ""
+rabbitmqHostnameSecretKeyRef: {}
+rabbitmqPassword: ""
+rabbitmqPasswordSecretKeyRef: {}
+rabbitmqProtocol: ""
+rabbitmqUsername: ""
+rabbitmqUsernameSecretKeyRef: {}
 
-# Service type (ClusterIP, NodePort, LoadBalancer)
-#serviceType: ClusterIP
+#-----------------------------------------------------------------------------------------------------------------------
+# NEW VALUES
+#-----------------------------------------------------------------------------------------------------------------------
 
-# Service port
-port: 9000
+controller:
+  enabled: true
+  type: deployment
+  deployment:
+    strategy: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: "0"
+      maxSurge: 50%
+  restartPolicy: Always
+
+imagePullSecrets:
+  - "{{ .Release.Name }}-{{ .Values.global.codefresh }}-registry"
 
-# Pod (target) port
-targetPort: 9000
+podSecurityContext: {}
 
-# formatLogsToElk logs will be formatter as elk expect to read it
-formatLogsToElk: true
+podAnnotations:
+  checksum/secret: '{{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}'
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+topologySpreadConstraints: []
 
-# HorizontalPodAutoscaler
 hpa:
   enabled: false
-  minReplicas: 1
-  maxReplicas: 2
-  targetCPU: 70
+  minReplicas: 2
+  maxReplicas: 10
+  targetCPUUtilizationPercentage: 70
 
-# PodDisruptionBudget
 pdb:
   enabled: false
   minAvailable: "50%"
-  maxUnavailable: ""
 
-readinessProbe:
-  enabled: true
-  periodSeconds: 5
-  successThreshold: 1
-  failureThreshold: 2
-  timeoutSeconds: 10
+serviceAccount:
+  enabled: false
 
-livenessProbe:
-  enabled: true
-  periodSeconds: 50
-  successThreshold: 1
-  failureThreshold: 3
-  initialDelaySeconds: 30
-  timeoutSeconds: 10
+rbac:
+  enabled: false
 
-affinity: {}
-nodeSelector: {}
-tolerations: []
+container:
+  image:
+    registry: 839151377425.dkr.ecr.us-east-1.amazonaws.com/codefresh-inc
+    repository: codefresh/kube-integration
+    tag: master
+    pullPolicy: IfNotPresent
+
+  command: []
+  args: []
+
+  containerSecurityContext:
+    allowPrivilegeEscalation: false
+
+  env:
+    # updated POSTGRES_* env vars
+    POSTGRES_HOST:
+      valueFrom:
+        secretKeyRef:
+          name: '{{ include (printf "cf-common-%s.classic.postgres-hostname-env-var-secret-name" (index .Subcharts "cf-common").Chart.Version) . }}'
+          key: '{{ include (printf "cf-common-%s.classic.postgres-hostname-env-var-secret-key" (index .Subcharts "cf-common").Chart.Version) . }}'
+          optional: true
+    POSTGRES_PASSWORD:
+      valueFrom:
+        secretKeyRef:
+          name: '{{ include (printf "cf-common-%s.classic.postgres-password-env-var-secret-name" (index .Subcharts "cf-common").Chart.Version) . }}'
+          key: '{{ include (printf "cf-common-%s.classic.postgres-password-env-var-secret-key" (index .Subcharts "cf-common").Chart.Version) . }}'
+          optional: true
+    POSTGRES_USER:
+      valueFrom:
+        secretKeyRef:
+          name: '{{ include (printf "cf-common-%s.classic.postgres-user-env-var-secret-name" (index .Subcharts "cf-common").Chart.Version) . }}'
+          key: '{{ include (printf "cf-common-%s.classic.postgres-user-env-var-secret-key" (index .Subcharts "cf-common").Chart.Version) . }}'
+          optional: true
+
+    # updated RABBITMQ_* env vars
+    RABBITMQ_HOSTNAME:
+      valueFrom:
+        secretKeyRef:
+          name: '{{ include (printf "cf-common-%s.classic.rabbitmq-hostname-env-var-secret-name" (index .Subcharts "cf-common").Chart.Version) . }}'
+          key: '{{ include (printf "cf-common-%s.classic.rabbitmq-hostname-env-var-secret-key" (index .Subcharts "cf-common").Chart.Version) . }}'
+          optional: true
+    RABBITMQ_PASSWORD:
+      valueFrom:
+        secretKeyRef:
+          name: '{{ include (printf "cf-common-%s.classic.rabbitmq-password-env-var-secret-name" (index .Subcharts "cf-common").Chart.Version) . }}'
+          key: '{{ include (printf "cf-common-%s.classic.rabbitmq-password-env-var-secret-key" (index .Subcharts "cf-common").Chart.Version) . }}'
+          optional: true
+    RABBITMQ_USERNAME:
+      valueFrom:
+        secretKeyRef:
+          name: '{{ include (printf "cf-common-%s.classic.rabbitmq-username-env-var-secret-name" (index .Subcharts "cf-common").Chart.Version) . }}'
+          key: '{{ include (printf "cf-common-%s.classic.rabbitmq-username-env-var-secret-key" (index .Subcharts "cf-common").Chart.Version) . }}'
+          optional: true
+    EVENTBUS_URI: $(RABBITMQ_PROTOCOL)://$(RABBITMQ_USERNAME):$(RABBITMQ_PASSWORD)@$(RABBITMQ_HOSTNAME)
+
+    AGENT: '{{ .Values.global.agent }}'
+    EVENTBUS_IGNORE_CREATE_SCHEMA: true
+    FORMAT_LOGS_TO_ELK: true
+    MODE: "1"
+    NODE_ENV: kubernetes
+    PORT: '{{ .Values.global.kubeIntegrationPort }}'
+    SERVICE_NAME: '{{ include (printf "cf-common-%s.names.name" (index .Subcharts "cf-common").Chart.Version) . }}'
+
+  probes:
+    liveness:
+      enabled: true
+      type: httpGet
+      httpGet:
+        path: /api/ping
+        port: http
+      spec:
+        initialDelaySeconds: 30
+        periodSeconds: 15
+        timeoutSeconds: 15
+        successThreshold: 1
+        failureThreshold: 2
+    readiness:
+      enabled: true
+      type: httpGet
+      httpGet:
+        path: /api/ping
+        port: http
+      spec:
+        initialDelaySeconds: 30
+        periodSeconds: 15
+        timeoutSeconds: 15
+        successThreshold: 1
+        failureThreshold: 2
+    startup:
+      enabled: false
+
+  resources:
+    limits: {}
+    requests: {}
+
+secrets:
+  secret:
+    enabled: true
+    stringData:
+      # updated POSTGRES_* secrets
+      POSTGRES_HOST: '{{ coalesce .Values.postgresHostname .Values.global.postgresHostname (printf "%s-%s" .Release.Name .Values.global.postgresService) }}'
+      POSTGRES_PASSWORD: "{{ coalesce .Values.postgresPassword .Values.global.postgresPassword }}"
+      POSTGRES_USER: "{{ coalesce .Values.postgresUser .Values.global.postgresUser }}"
+      POSTGRES_DATABASE: '{{ coalesce .Values.postgresDatabase .Values.global.postgresDatabase }}'
+      POSTGRES_PORT: '{{ coalesce .Values.postgresPort .Values.global.postgresPort }}'
+
+      # updated RABBITMQ_* secrets
+      RABBITMQ_HOSTNAME: '{{ coalesce .Values.rabbitmqHostname .Values.global.rabbitmqHostname (printf "%s-%s" .Release.Name (coalesce .Values.global.rabbitService .Values.global.rabbitmqService) ) }}'
+      RABBITMQ_PASSWORD: "{{ coalesce .Values.rabbitmqPassword .Values.global.rabbitmqPassword }}"
+      RABBITMQ_USERNAME: "{{ coalesce .Values.rabbitmqUsername .Values.global.rabbitmqUsername }}"
+      RABBITMQ_PROTOCOL: '{{ coalesce .Values.rabbitmqProtocol .Values.global.rabbitmqProtocol "amqp" }}'
+
+      NEWRELIC_LICENSE_KEY: '{{ .Values.global.newrelicLicenseKey }}'
+
+service:
+  main:
+    enabled: true
+    primary: true
+    type: ClusterIP
+    ports:
+      http:
+        port: 9000
+        protocol: HTTP

package/.nvmrc

@@ -1 +1 @@
-v14.20.0
+v14.21.1

package/Dockerfile

@@ -1,4 +1,9 @@
-FROM node:14.21.3-alpine
+FROM --platform=$BUILDPLATFORM node:16.20.2-alpine
+
+ARG TARGETPLATFORM
+ARG TARGETARCH
+RUN printf "Building for TARGETPLATFORM=${TARGETPLATFORM}" \
+    && printf ", TARGETARCH=${TARGETARCH}"
 
 WORKDIR /kube-integration
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.26.2",
+  "version": "1.26.4-test16",
   "name": "@codefresh-io/kube-integration",
   "main": "index.js",
   "description": "",
@@ -19,7 +19,7 @@
     "url": "git+https://github.com/codefresh-io/kube-integration.git"
   },
   "engines": {
-    "node": "^14.21.1"
+    "node": "^16.20.2"
   },
   "author": "Oleg Sucharevich <olegs@codefresh.io>",
   "license": "ISC",
@@ -36,13 +36,18 @@
     "openid-client": "^4.9.0",
     "request/qs": "6.5.3",
     "kubernetes-client/qs": "6.9.7",
-    "nodegistry/request/qs": "6.5.3"
+    "nodegistry/request/qs": "6.5.3",
+    "semver": "7.5.2",
+    "protobufjs": "7.2.4",
+    "http-cache-semantics": "4.1.1",
+    "jose": "3.20.4",
+    "tough-cookie": "4.1.3"
   },
   "dependencies": {
     "@codefresh-io/docker-reference": "^0.0.5",
     "@codefresh-io/eventbus": "1.4.3",
-    "@codefresh-io/http-infra": "1.8.12",
-    "@codefresh-io/cf-monitor": "0.0.25",
+    "@codefresh-io/http-infra": "1.8.14",
+    "@codefresh-io/cf-monitor": "0.0.27",
     "bluebird": "^3.5.0",
     "body-parser": "1.19.2",
     "cf-errors": "^0.1.16",
@@ -54,14 +59,13 @@
     "google-protobuf": "^3.5.0",
     "js-yaml": "^3.13.1",
     "kube-config-builder": "^1.1.3",
-    "kubernetes-client": "^8.3.7",
+    "kubernetes-client": "^9.0.0",
     "lodash": "~4.17.21",
     "method-override": "^2.3.9",
     "morgan": "^1.10.0",
     "nock": "^12.0.3",
-    "nodegistry": "^1.2.3",
+    "nodegistry": "^1.2.5",
     "object-hash": "^1.2.0",
-    "request": "^2.88.2",
     "request-promise": "^4.2.6",
     "uuid": "^3.1.0"
   },

package/service.yaml

@@ -1 +1 @@
-version: 1.28.3
+version: 1.30.4

package/.deploy/kube-integration/README.md

@@ -1,50 +0,0 @@
-# CFUI helm chart
-
-## Supported values
-
-## replicaCount
-number of pods to be schedualed
-default: `replicaCount: 1`
-
-## imagePullPolicy
-'Always' if imageTag is 'latest', else set to 'IfNotPresent' ref: http://kubernetes.io/docs/user-guide/images/##pre-pulling-images
-default: `imagePullPolicy: Always`
-
-## redeploy
-whenever to force redeploy
-default: `redeploy: false`
-
-## imageTag
-set the tag of the image
-default: `imageTag: master`
-
-## image
-base name of the image
-default: `image: r.cfcr.io/codefresh-inc/codefresh/cf-broadcaster`
-
-## affinity
-special spesification
-default: `affinity: {}`
-
-## env
-set of evnrionment varialbe to be add to the containers
-default:
-```
-env:
-  NODE_ENV: kubernetes
-```
-
-## port
-container port
-default: `port: 9016`
-
-## servicePort
-port of the kubernetes service listen to
-default: `servicePort: 80`
-
-## dockercfg
-docker config valid string
-default: `dockercfg: {}`
-
-## newrelicLicenseKey
-default: `newrelicLicenseKey: ""`

package/.deploy/kube-integration/templates/_helpers.tpl

@@ -1,36 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "kube-integration.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "kube-integration.fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{/*
-  Create a default fully qualified app name.
-  We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-  If release name contains chart name it will be used as a full name.
-  */}}
-{{- define "kube-integration.fqdn" -}}
-  {{- $name := "" -}}
-  {{- if $.Values.fullnameOverride -}}
-    {{- $name =$.Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-  {{- else -}}
-    {{- $name = default .Chart.Name .Values.nameOverride -}}
-    {{- if contains $name .Release.Name -}}
-    {{- $name = .Release.Name | trunc 63 | trimSuffix "-" -}}
-    {{- else -}}
-    {{- $name = printf "%s-%s" .Release.Name $name -}}
-    {{- end -}}
-  {{- end -}}
-{{- printf "%s.%s.svc.cluster.local" $name .Release.Namespace  | trunc 63 | trimSuffix "-" -}}
-{{- end -}}

package/.deploy/kube-integration/templates/deployment.yaml

@@ -1,169 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ template "kube-integration.fullname" $ }}-{{ .version | default "base" }}
-  labels:
-    app: {{ template "kube-integration.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    release: {{ .Release.Name  | quote }}
-    heritage: {{ .Release.Service  | quote }}
-    version: {{ .version | default "base" | quote  }}
-spec:
-  {{- if not .Values.hpa.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      app: {{ template "kube-integration.fullname" . }}
-  template:
-    metadata:
-      annotations:
-        checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
-      labels:
-        app: {{ template "kube-integration.fullname" . }}
-        chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-        release: {{ .Release.Name  | quote }}
-        heritage: {{ .Release.Service  | quote }}
-        version: {{ .version | default "base" | quote  }}
-    spec:
-      {{- with .Values.podSecurityContext }}
-      securityContext: {{ toYaml . | nindent 8}}
-      {{- end }}
-      {{- if .Values.affinity }}
-      affinity: {{ toYaml .Values.affinity | nindent 8 }}
-      {{- end }}
-      {{- if .Values.nodeSelector }}
-      nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
-      {{- end }}
-      {{- if .Values.tolerations }}
-      tolerations: {{ toYaml .Values.tolerations | nindent 8 }}
-      {{- end }}
-      {{- if .Values.global.hostAliases }}
-      hostAliases:
-{{ toYaml .Values.global.hostAliases | indent 8 }}
-      {{- end }}
-      imagePullSecrets:
-        - name: "{{ .Release.Name }}-{{ .Values.global.codefresh }}-registry"
-      terminationGracePeriodSeconds: 10
-      containers:
-      - name: {{ template "kube-integration.fullname" . }}
-        {{- if .Values.global.privateRegistry }}
-        image: "{{ .Values.global.dockerRegistry }}{{ .Values.image }}:{{ .Values.imageTag }}"
-        {{- else }}
-        image: "{{ .Values.dockerRegistry }}{{ .Values.image }}:{{ .Values.imageTag }}"
-        {{- end }}
-        {{- if not .Values.global.devEnvironment }}
-        securityContext:
-          allowPrivilegeEscalation: false
-        {{- end }}
-        imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
-        {{- if .Values.resources }}
-        resources: {{ toYaml .Values.resources | nindent 10 }}
-        {{- end }}
-        env:
-        {{- if .Values.global.env }}
-        {{- range $key, $value := .Values.global.env }}
-        - name: {{ $key }}
-          value: {{ $value | quote }}
-        {{- end}}
-        {{- end}}
-        {{- range $key, $value := $.Values.env }}
-        - name: {{ $key }}
-          value: {{ $value | quote }}
-        {{- end }}
-        - name: AGENT
-          value: {{ .Values.global.agent }}
-        # Mode variable to start it as http server
-        - name: MODE
-          value: "1"
-        - name: NODE_ENV
-          value: kubernetes
-        - name: MONGO_URI
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "kube-integration.fullname" . }}
-              key: mongo-uri
-        - name: RABBIT_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Release.Name }}-{{ .Values.global.codefresh }}"
-              key: rabbitmq-password
-        - name: RABBIT_USER
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Release.Name }}-{{ .Values.global.codefresh }}"
-              key: rabbitmq-username
-        - name: RABBIT_PROTOCOL
-          value: {{ .Values.global.rabbitmqProtocol | default "amqp" | quote }}
-        - name: EVENTBUS_URI
-          value: $(RABBIT_PROTOCOL)://$(RABBIT_USER):$(RABBIT_PASSWORD)@{{ default (printf "%s-%s" .Release.Name .Values.global.rabbitService) .Values.global.rabbitmqHostname }}
-        - name: POSTGRES_HOST
-          value: {{ default (printf "%s-%s" .Release.Name .Values.global.postgresService) .Values.global.postgresHostname | quote }}
-        - name: POSTGRES_DATABASE
-          value: {{ .Values.global.postgresDatabase }}
-        - name: POSTGRES_PORT
-          value: {{ .Values.global.postgresPort | quote }}
-        - name: POSTGRES_USER
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Release.Name }}-{{ .Values.global.codefresh }}"
-              key: postgres-user
-        - name: POSTGRES_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Release.Name }}-{{ .Values.global.codefresh }}"
-              key: postgres-password
-        - name: NEWRELIC_LICENSE_KEY
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Release.Name }}-{{ .Values.global.codefresh }}"
-              key: newrelic-license-key
-        - name: PORT
-          value: "{{ .Values.global.kubeIntegrationPort }}"
-        - name: SERVICE_NAME
-          value: {{ template "kube-integration.name" . }}
-        - name: FORMAT_LOGS_TO_ELK
-          value: "{{ .Values.formatLogsToElk }}"
-        {{- if $.Values.global.mongoTLS }}
-        - name: MTLS_CERT_PATH
-          value: /etc/ssl/mongodb/ca.pem
-        {{- end }}
-        ports:
-        - containerPort: {{ .Values.targetPort }}
-          protocol: TCP
-        {{- if .Values.readinessProbe.enabled }}
-        readinessProbe: {{ toYaml (omit .Values.readinessProbe "enabled") | nindent 10 }}
-          httpGet:
-            path: /api/ping
-            port: {{ .Values.targetPort }}
-        {{- end }}
-        {{- if .Values.livenessProbe.enabled }}
-        livenessProbe: {{ toYaml (omit .Values.livenessProbe "enabled") | nindent 10 }}
-          httpGet:
-            path: /api/ping
-            port: {{ .Values.targetPort }}
-        {{- end }}
-        volumeMounts:
-          {{- if .Values.global.addResolvConf }}
-          - mountPath: /etc/resolv.conf
-            name: resolvconf
-            subPath: resolv.conf
-            readOnly: true
-          {{- end }}
-          {{- if $.Values.global.mongoTLS }}
-          - mountPath: /etc/ssl/mongodb/
-            name: mongodb-tls
-            readOnly: true
-          {{- end }}
-      volumes:
-        {{- if .Values.global.addResolvConf }}
-        - name: resolvconf
-          configMap:
-            name: {{ .Release.Name }}-{{ .Values.global.codefresh }}-resolvconf
-        {{- end }}
-        {{- if $.Values.global.mongoTLS }}
-        - name: mongodb-tls
-          secret:
-            secretName: {{ $.Release.Name }}-{{ $.Values.global.codefresh }}-mongodb-tls
-        {{- end }}
-      restartPolicy: Always

package/.deploy/kube-integration/templates/secrets.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "kube-integration.fullname" . }}
-  labels:
-    app: {{ template "kube-integration.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-type: Opaque
-stringData:
-  {{- if .Values.global.onprem }}
-  mongo-uri: {{ include "calculateMongoURI" (dict "dbName" .Values.global.clusterProvidersService "mongoURI" .Values.global.mongoURI) }}
-  {{- else }}
-  # this is for production env - the value used there is incorrect, but I should leave it for now to be clarified later
-  mongo-uri: {{ coalesce .Values.mongoURI (printf "mongodb://%s:%s@%s-%s:%s/%s" .Values.global.mongodbUsername .Values.global.mongodbPassword .Release.Name .Values.global.mongoService (toString .Values.global.mongoPort) .Values.global.clusterProvidersService) }}
-  {{- end }}