feat(cf-common): don't merge global constaints

.github/workflows/lint-test.yaml

@@ -93,7 +93,7 @@ jobs:
       - name: Run chart-testing (install)
         run: |
           changed=$(ct list-changed --config "ct.yaml")
-          if [[ "$changed" == "charts/cf-common" || "$changed" =~ "charts/builder" || "$changed" =~ "charts/runner" ]]; then
+          if [[ "$changed" =~ "charts/cf-common" || "$changed" =~ "charts/builder" || "$changed" =~ "charts/runner" ]]; then
             # Do not run `ct install` for cf-common (library chart) or builder/runner
             exit 0
           fi

charts/cf-common-test/tests/deployment/spec_test.yaml

@@ -159,7 +159,7 @@ tests:
           path: spec.template.spec.nodeSelector
           value:
             alice: bob
-  
+
   - it: Test deployment nodeSelector with global nodeSelector
     values:
       - values.yaml
@@ -228,12 +228,6 @@ tests:
             effect: NoSchedule
             key: codefresh.io
             value: app
-      - contains:
-          path: spec.template.spec.tolerations
-          content:
-            effect: NoSchedule
-            key: worker
-            value: true
 
   - it: Test deployments affinity
     values:
@@ -316,14 +310,6 @@ tests:
       - equal:
           path: spec.template.spec.affinity
           value:
-            nodeAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-                nodeSelectorTerms:
-                  - matchExpressions:
-                      - key: node-type
-                        operator: In
-                        values:
-                          - app
             podAffinity:
               requiredDuringSchedulingIgnoredDuringExecution:
                 - labelSelector:

charts/cf-common/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.0.0
 description: Codefresh library chart
 name: cf-common
-version: 0.24.0
+version: 0.25.0
 type: library
 keywords:
   - codefresh

charts/cf-common/README.md

@@ -2,7 +2,7 @@
 
 Codefresh library chart
 
-![Version: 0.24.0](https://img.shields.io/badge/Version-0.24.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
+![Version: 0.25.0](https://img.shields.io/badge/Version-0.25.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
 
 ## Installing the Chart
 
@@ -18,7 +18,7 @@ Include this chart as a dependency in your `Chart.yaml` e.g.
 # Chart.yaml
 dependencies:
 - name: cf-common
-  version: 0.24.0
+  version: 0.25.0
   repository: https://chartmuseum.codefresh.io/cf-common
 ```
 

charts/cf-common/templates/classic/_env_var_secret_ref.tpl

@@ -1,18 +1,18 @@
 {{- /*
 MONGODB_HOST env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.mongodb-host-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.mongodb-host-env-var-secret-name" }}
   {{- if or .Values.mongodbHostSecretKeyRef .Values.global.mongodbHostSecretKeyRef }}
 {{- printf (coalesce .Values.mongodbHostSecretKeyRef.name .Values.global.mongodbHostSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 MONGODB_HOST env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.mongodb-host-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.mongodb-host-env-var-secret-key" }}
   {{- if or .Values.mongodbHostSecretKeyRef .Values.global.mongodbHostSecretKeyRef }}
 {{- printf (coalesce .Values.mongodbHostSecretKeyRef.key .Values.global.mongodbHostSecretKeyRef.key) }}
   {{- else }}
@@ -23,18 +23,18 @@ MONGODB_HOST env var secret key
 {{- /*
 MONGODB_USER env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.mongodb-user-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.mongodb-user-env-var-secret-name" }}
   {{- if or .Values.mongodbUserSecretKeyRef .Values.global.mongodbUserSecretKeyRef }}
 {{- printf (coalesce .Values.mongodbUserSecretKeyRef.name .Values.global.mongodbUserSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 MONGODB_USER env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.mongodb-user-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.mongodb-user-env-var-secret-key" }}
   {{- if or .Values.mongodbUserSecretKeyRef .Values.global.mongodbUserSecretKeyRef }}
 {{- printf (coalesce .Values.mongodbUserSecretKeyRef.key .Values.global.mongodbUserSecretKeyRef.key) }}
   {{- else }}
@@ -45,18 +45,18 @@ MONGODB_USER env var secret key
 {{- /*
 MONGODB_PASSWORD env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.mongodb-password-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.mongodb-password-env-var-secret-name" }}
   {{- if or .Values.mongodbPasswordSecretKeyRef .Values.global.mongodbPasswordSecretKeyRef }}
 {{- printf (coalesce .Values.mongodbPasswordSecretKeyRef.name .Values.global.mongodbPasswordSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 MONGODB_PASSWORD env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.mongodb-password-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.mongodb-password-env-var-secret-key" }}
   {{- if or .Values.mongodbPasswordSecretKeyRef .Values.global.mongodbPasswordSecretKeyRef }}
 {{- printf (coalesce .Values.mongodbPasswordSecretKeyRef.key .Values.global.mongodbPasswordSecretKeyRef.key) }}
   {{- else }}
@@ -67,7 +67,7 @@ MONGODB_PASSWORD env var secret key
 {{- /*
 MONGO_URI env var value
 */}}
-{{- define "cf-common-0.24.0.classic.mongo-uri-env-var-value" }}
+{{- define "cf-common-0.25.0.classic.mongo-uri-env-var-value" }}
 {{- /*
 Check for legacy global.mongoURI
 */}}
@@ -84,7 +84,7 @@ New secret implementation
 {{- /*
 MONGO_URI_ARCHIVE env var value
 */}}
-{{- define "cf-common-0.24.0.classic.mongo-uri-archive-env-var-value" }}
+{{- define "cf-common-0.25.0.classic.mongo-uri-archive-env-var-value" }}
 {{- /*
 Check for legacy global.mongoURIArchive or global.mongoURI
 */}}
@@ -102,18 +102,18 @@ New secret implementation
 {{- /*
 REDIS_URL env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.redis-url-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.redis-url-env-var-secret-name" }}
   {{- if or .Values.redisUrlSecretKeyRef .Values.global.redisUrlSecretKeyRef }}
 {{- printf (coalesce .Values.redisUrlSecretKeyRef.name .Values.global.redisUrlSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 REDIS_URL env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.redis-url-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.redis-url-env-var-secret-key" }}
   {{- if or .Values.redisUrlSecretKeyRef .Values.global.redisUrlSecretKeyRef }}
 {{- printf (coalesce .Values.redisUrlSecretKeyRef.key .Values.global.redisUrlSecretKeyRef.key) }}
   {{- else }}
@@ -124,18 +124,18 @@ REDIS_URL env var secret key
 {{- /*
 REDIS_PASSWORD env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.redis-password-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.redis-password-env-var-secret-name" }}
   {{- if or .Values.redisPasswordSecretKeyRef .Values.global.redisPasswordSecretKeyRef }}
 {{- printf (coalesce .Values.redisPasswordSecretKeyRef.name .Values.global.redisPasswordSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 REDIS_PASSWORD env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.redis-password-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.redis-password-env-var-secret-key" }}
   {{- if or .Values.redisPasswordSecretKeyRef .Values.global.redisPasswordSecretKeyRef }}
 {{- printf (coalesce .Values.redisPasswordSecretKeyRef.key .Values.global.redisPasswordSecretKeyRef.key) }}
   {{- else }}
@@ -146,18 +146,18 @@ REDIS_PASSWORD env var secret key
 {{- /*
 POSTGRES_HOSTNAME env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.postgres-hostname-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.postgres-hostname-env-var-secret-name" }}
   {{- if or .Values.postgresHostnameSecretKeyRef .Values.global.postgresHostnameSecretKeyRef }}
 {{- printf (coalesce .Values.postgresHostnameSecretKeyRef.name .Values.global.postgresHostnameSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 POSTGRES_HOSTNAME env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.postgres-hostname-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.postgres-hostname-env-var-secret-key" }}
   {{- if or .Values.postgresHostnameSecretKeyRef .Values.global.postgresHostnameSecretKeyRef }}
 {{- printf (coalesce .Values.postgresHostnameSecretKeyRef.key .Values.global.postgresHostnameSecretKeyRef.key) }}
   {{- else }}
@@ -168,18 +168,18 @@ POSTGRES_HOSTNAME env var secret key
 {{- /*
 POSTGRES_PASSWORD env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.postgres-password-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.postgres-password-env-var-secret-name" }}
   {{- if or .Values.postgresPasswordSecretKeyRef .Values.global.postgresPasswordSecretKeyRef }}
 {{- printf (coalesce .Values.postgresPasswordSecretKeyRef.name .Values.global.postgresPasswordSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 POSTGRES_PASSWORD env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.postgres-password-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.postgres-password-env-var-secret-key" }}
   {{- if or .Values.postgresPasswordSecretKeyRef .Values.global.postgresPasswordSecretKeyRef }}
 {{- printf (coalesce .Values.postgresPasswordSecretKeyRef.key .Values.global.postgresPasswordSecretKeyRef.key) }}
   {{- else }}
@@ -190,18 +190,18 @@ POSTGRES_PASSWORD env var secret key
 {{- /*
 POSTGRES_USER env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.postgres-user-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.postgres-user-env-var-secret-name" }}
   {{- if or .Values.postgresUserSecretKeyRef .Values.global.postgresUserSecretKeyRef }}
 {{- printf (coalesce .Values.postgresUserSecretKeyRef.name .Values.global.postgresUserSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 POSTGRES_USER env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.postgres-user-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.postgres-user-env-var-secret-key" }}
   {{- if or .Values.postgresUserSecretKeyRef .Values.global.postgresUserSecretKeyRef }}
 {{- printf (coalesce .Values.postgresUserSecretKeyRef.key .Values.global.postgresUserSecretKeyRef.key) }}
   {{- else }}
@@ -212,18 +212,18 @@ POSTGRES_USER env var secret key
 {{- /*
 RABBITMQ_HOSTNAME env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.rabbitmq-hostname-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.rabbitmq-hostname-env-var-secret-name" }}
   {{- if or .Values.rabbitmqHostnameSecretKeyRef .Values.global.rabbitmqHostnameSecretKeyRef }}
 {{- printf (coalesce .Values.rabbitmqHostnameSecretKeyRef.name .Values.global.rabbitmqHostnameSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 RABBITMQ_HOSTNAME env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.rabbitmq-hostname-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.rabbitmq-hostname-env-var-secret-key" }}
   {{- if or .Values.rabbitmqHostnameSecretKeyRef .Values.global.rabbitmqHostnameSecretKeyRef }}
 {{- printf (coalesce .Values.rabbitmqHostnameSecretKeyRef.key .Values.global.rabbitmqHostnameSecretKeyRef.key) }}
   {{- else }}
@@ -234,18 +234,18 @@ RABBITMQ_HOSTNAME env var secret key
 {{- /*
 RABBITMQ_PASSWORD env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.rabbitmq-password-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.rabbitmq-password-env-var-secret-name" }}
   {{- if or .Values.rabbitmqPasswordSecretKeyRef .Values.global.rabbitmqPasswordSecretKeyRef }}
 {{- printf (coalesce .Values.rabbitmqPasswordSecretKeyRef.name .Values.global.rabbitmqPasswordSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 RABBITMQ_PASSWORD env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.rabbitmq-password-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.rabbitmq-password-env-var-secret-key" }}
   {{- if or .Values.rabbitmqPasswordSecretKeyRef .Values.global.rabbitmqPasswordSecretKeyRef }}
 {{- printf (coalesce .Values.rabbitmqPasswordSecretKeyRef.key .Values.global.rabbitmqPasswordSecretKeyRef.key) }}
   {{- else }}
@@ -256,18 +256,18 @@ RABBITMQ_PASSWORD env var secret key
 {{- /*
 RABBITMQ_USERNAME env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.rabbitmq-username-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.rabbitmq-username-env-var-secret-name" }}
   {{- if or .Values.rabbitmqUsernameSecretKeyRef .Values.global.rabbitmqUsernameSecretKeyRef }}
 {{- printf (coalesce .Values.rabbitmqUsernameSecretKeyRef.name .Values.global.rabbitmqUsernameSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 RABBITMQ_USERNAME env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.rabbitmq-username-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.rabbitmq-username-env-var-secret-key" }}
   {{- if or .Values.rabbitmqUsernameSecretKeyRef .Values.global.rabbitmqUsernameSecretKeyRef }}
 {{- printf (coalesce .Values.rabbitmqUsernameSecretKeyRef.key .Values.global.rabbitmqUsernameSecretKeyRef.key) }}
   {{- else }}
@@ -278,18 +278,18 @@ RABBITMQ_USERNAME env var secret key
 {{- /*
 FIREBASE_SECRET env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.firebase-secret-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.firebase-secret-env-var-secret-name" }}
   {{- if or .Values.firebaseSecretSecretKeyRef .Values.global.firebaseSecretSecretKeyRef }}
 {{- printf (coalesce .Values.firebaseSecretSecretKeyRef.name .Values.global.firebaseSecretSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 FIREBASE_SECRET env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.firebase-secret-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.firebase-secret-env-var-secret-key" }}
   {{- if or .Values.firebaseSecretSecretKeyRef .Values.global.firebaseSecretSecretKeyRef }}
 {{- printf (coalesce .Values.firebaseSecretSecretKeyRef.key .Values.global.firebaseSecretSecretKeyRef.key) }}
   {{- else }}
@@ -300,18 +300,18 @@ FIREBASE_SECRET env var secret key
 {{- /*
 FIREBASE_URL env var secret name
 */}}
-{{- define "cf-common-0.24.0.classic.firebase-url-env-var-secret-name" }}
+{{- define "cf-common-0.25.0.classic.firebase-url-env-var-secret-name" }}
   {{- if or .Values.firebaseUrlSecretKeyRef .Values.global.firebaseUrlSecretKeyRef }}
 {{- printf (coalesce .Values.firebaseUrlSecretKeyRef.name .Values.global.firebaseUrlSecretKeyRef.name) }}
   {{- else }}
-{{- printf "%s-%s" (include "cf-common-0.24.0.names.fullname" .) "secret" }}
+{{- printf "%s-%s" (include "cf-common-0.25.0.names.fullname" .) "secret" }}
   {{- end }}
 {{- end }}
 
 {{- /*
 FIREBASE_URL env var secret key
 */}}
-{{- define "cf-common-0.24.0.classic.firebase-url-env-var-secret-key" }}
+{{- define "cf-common-0.25.0.classic.firebase-url-env-var-secret-key" }}
   {{- if or .Values.firebaseUrlSecretKeyRef .Values.global.firebaseUrlSecretKeyRef }}
 {{- printf (coalesce .Values.firebaseUrlSecretKeyRef.key .Values.global.firebaseUrlSecretKeyRef.key) }}
   {{- else }}