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

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

@@ -15,4 +15,4 @@ maintainers:
 dependencies:
   - name: cf-common
     repository: https://chartmuseum.codefresh.io/cf-common
-    version: "0.11.1"
+    version: "0.12.0"

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

@@ -1,4 +1,7 @@
 ## See full values structure at https://github.com/codefresh-io/helm-charts/blob/master/charts/cf-common/values.yaml
+#-----------------------------------------------------------------------------------------------------------------------
+# GLOBAL VALUES
+#-----------------------------------------------------------------------------------------------------------------------
 global:
   imageRegistry: ""
 
@@ -11,19 +14,39 @@ global:
   newrelicLicenseKey: ""
   postgresDatabase: ""
   postgresHostname: ""
+  postgresHostnameSecretKeyRef: {}
   postgresPassword: ""
+  postgresPasswordSecretKeyRef: {}
   postgresPort: ""
   postgresUser: ""
+  postgresUserSecretKeyRef: {}
   rabbitmqHostname: ""
+  rabbitmqHostnameSecretKeyRef: {}
   rabbitmqPassword: ""
+  rabbitmqPasswordSecretKeyRef: {}
   rabbitmqProtocol: ""
   rabbitmqUsername: ""
+  rabbitmqUsernameSecretKeyRef: {}
 
 #-----------------------------------------------------------------------------------------------------------------------
-# LEGACY VALUES
+# LOCAL VALUES
 #-----------------------------------------------------------------------------------------------------------------------
 
-# empty
+postgresDatabase: ""
+postgresHostname: ""
+postgresHostnameSecretKeyRef: {}
+postgresPassword: ""
+postgresPasswordSecretKeyRef: {}
+postgresPort: ""
+postgresUser: ""
+postgresUserSecretKeyRef: {}
+rabbitmqHostname: ""
+rabbitmqHostnameSecretKeyRef: {}
+rabbitmqPassword: ""
+rabbitmqPasswordSecretKeyRef: {}
+rabbitmqProtocol: ""
+rabbitmqUsername: ""
+rabbitmqUsernameSecretKeyRef: {}
 
 #-----------------------------------------------------------------------------------------------------------------------
 # NEW VALUES
@@ -85,6 +108,47 @@ container:
     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
@@ -129,13 +193,20 @@ secrets:
   secret:
     enabled: true
     stringData:
-      EVENTBUS_URI: '{{ include (printf "cf-common-%s.classic.calculateRabbitMqUri" (index .Subcharts "cf-common").Chart.Version) . }}'
+      # 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 }}'
-      POSTGRES_DATABASE: '{{ .Values.global.postgresDatabase }}'
-      POSTGRES_HOST: '{{ default (printf "%s-%s" .Release.Name .Values.global.postgresService) .Values.global.postgresHostname }}'
-      POSTGRES_PASSWORD: '{{ .Values.global.postgresPassword }}'
-      POSTGRES_PORT: '{{ .Values.global.postgresPort }}'
-      POSTGRES_USER: '{{ .Values.global.postgresUser }}'
 
 service:
   main:

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM node:14.21.3-alpine
+FROM --platform=$BUILDPLATFORM node:16.20.2-alpine
 
 ARG TARGETPLATFORM
 ARG TARGETARCH

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.26.3",
+  "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",
@@ -38,7 +38,10 @@
     "kubernetes-client/qs": "6.9.7",
     "nodegistry/request/qs": "6.5.3",
     "semver": "7.5.2",
-    "protobufjs": "7.2.4"
+    "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",
@@ -63,7 +66,6 @@
     "nock": "^12.0.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.30.2
+version: 1.30.4