diff --git a/README.md b/README.md index 2fff995f7..977ef8019 100644 --- a/README.md +++ b/README.md @@ -2520,7 +2520,6 @@ After platform upgrade, Consul fails with the error `refusing to rejoin cluster | consul | object | See below | consul Ref: https://github.com/bitnami/charts/blob/main/bitnami/consul/values.yaml | | context-manager | object | See below | context-manager | | cronus | object | See below | cronus | -| developmentChart | bool | `false` | | | dockerconfigjson | object | `{}` | DEPRECATED - Use `.imageCredentials` instead dockerconfig (for `kcfi` tool backward compatibility) for Image Pull Secret. Obtain GCR Service Account JSON (sa.json) at support@codefresh.io ```shell GCR_SA_KEY_B64=$(cat sa.json | base64) DOCKER_CFG_VAR=$(echo -n "_json_key:$(echo ${GCR_SA_KEY_B64} | base64 -d)" | base64 | tr -d '\n') ``` E.g.: dockerconfigjson: auths: gcr.io: auth: | | gencerts | object | See below | Job to generate internal runtime secrets. Required at first install. | | gitops-dashboard-manager | object | See below | gitops-dashboard-manager | @@ -2637,11 +2636,9 @@ After platform upgrade, Consul fails with the error `refusing to rejoin cluster | internal-gateway | object | See below | internal-gateway | | k8s-monitor | object | See below | k8s-monitor | | kube-integration | object | See below | kube-integration | -| mailer.enabled | bool | `false` | | | mongodb | object | See below | mongodb Ref: https://github.com/bitnami/charts/blob/main/bitnami/mongodb/values.yaml | | nats | object | See below | nats Ref: https://github.com/bitnami/charts/blob/main/bitnami/nats/values.yaml | | nomios | object | See below | nomios | -| payments.enabled | bool | `false` | | | pipeline-manager | object | See below | pipeline-manager | | postgresql | object | See below | postgresql Ref: https://github.com/bitnami/charts/blob/main/bitnami/postgresql/values.yaml | | postgresql-ha | object | See below | postgresql Ref: https://github.com/bitnami/charts/blob/main/bitnami/postgresql-ha/values.yaml | @@ -2651,7 +2648,6 @@ After platform upgrade, Consul fails with the error `refusing to rejoin cluster | redis-ha | object | `{"auth":true,"enabled":false,"haproxy":{"enabled":true,"resources":{"requests":{"cpu":"100m","memory":"128Mi"}}},"persistentVolume":{"enabled":true,"size":"10Gi"},"redis":{"resources":{"requests":{"cpu":"100m","memory":"128Mi"}}},"redisPassword":"hoC9szf7NtrU"}` | redis-ha # Ref: https://github.com/DandyDeveloper/charts/blob/master/charts/redis-ha/values.yaml | | runtime-environment-manager | object | See below | runtime-environment-manager | | runtimeImages | object | See below | runtimeImages | -| salesforce-reporter.enabled | bool | `false` | | | seed | object | See below | Seed jobs | | seed-e2e | object | `{"affinity":{},"backoffLimit":10,"enabled":false,"image":{"registry":"docker.io","repository":"mongo","tag":"latest"},"nodeSelector":{},"podSecurityContext":{},"resources":{},"tolerations":[],"ttlSecondsAfterFinished":300}` | CI | | seed.enabled | bool | `true` | Enable all seed jobs | @@ -2667,6 +2663,5 @@ After platform upgrade, Consul fails with the error `refusing to rejoin cluster | seed.postgresSeedJob.postgresPasswordSecretKeyRef | optional | `{}` | Password for "postgres" admin user from existing secret | | seed.postgresSeedJob.postgresUser | optional | `""` | "postgres" admin user in plain text (required ONLY for seed job!) Must be a privileged user allowed to create databases and grant roles. If omitted, username and password from `.Values.global.postgresUser/postgresPassword` will be used. | | seed.postgresSeedJob.postgresUserSecretKeyRef | optional | `{}` | "postgres" admin user from exising secret | -| segment-reporter.enabled | bool | `false` | | | tasker-kubernetes | object | `{"affinity":{},"container":{"image":{"registry":"us-docker.pkg.dev/codefresh-enterprise/gcr.io","repository":"codefresh/tasker-kubernetes"}},"enabled":true,"hpa":{"enabled":false},"imagePullSecrets":[],"nodeSelector":{},"pdb":{"enabled":false},"podSecurityContext":{},"resources":{"limits":{},"requests":{"cpu":"100m","memory":"128Mi"}},"tolerations":[]}` | tasker-kubernetes | | webTLS | object | `{"cert":"","enabled":false,"key":"","secretName":"star.codefresh.io"}` | DEPRECATED - Use `.Values.ingress.tls` instead TLS secret for Ingress | diff --git a/charts/codefresh/templates/hooks/pre-upgrade/enable-stable-flags-rabbitmq-job.yaml b/charts/codefresh/templates/hooks/pre-upgrade/enable-stable-flags-rabbitmq-job.yaml index cbff56fa1..6a76660bc 100644 --- a/charts/codefresh/templates/hooks/pre-upgrade/enable-stable-flags-rabbitmq-job.yaml +++ b/charts/codefresh/templates/hooks/pre-upgrade/enable-stable-flags-rabbitmq-job.yaml @@ -1,12 +1,12 @@ {{- if and .Values.hooks.rabbitmq.enabled .Values.rabbitmq.enabled }} {{- $libTemplateName := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }} -{{- $tolerations := .Values.hooks.consul.tolerations | default list }} +{{- $tolerations := .Values.hooks.rabbitmq.tolerations | default list }} {{- $globalTolerations := .Values.global.tolerations | default list }} {{- $allToleration := concat $globalTolerations $tolerations }} -{{- $affinity := .Values.hooks.consul.affinity | default dict }} +{{- $affinity := .Values.hooks.rabbitmq.affinity | default dict }} {{- $globalAffinity := .Values.global.affinity | default dict }} {{- $allAffinity := mergeOverwrite $globalAffinity $affinity }} -{{- $nodeSelector := .Values.hooks.consul.nodeSelector | default dict }} +{{- $nodeSelector := .Values.hooks.rabbitmq.nodeSelector | default dict }} {{- $globalNodeSelector := .Values.global.nodeSelector | default dict }} {{- $allNodeSelector := mergeOverwrite $globalNodeSelector $nodeSelector }} --- diff --git a/charts/codefresh/tests/misc/global_constrains_test.yaml b/charts/codefresh/tests/misc/global_constrains_test.yaml index 903808c14..d96b85006 100644 --- a/charts/codefresh/tests/misc/global_constrains_test.yaml +++ b/charts/codefresh/tests/misc/global_constrains_test.yaml @@ -1057,6 +1057,7 @@ tests: path: spec.template.spec.nodeSelector value: key: "value" + kubernetes.io/arch: amd64 - equal: path: spec.template.spec.affinity value: @@ -1089,6 +1090,7 @@ tests: path: spec.template.spec.nodeSelector value: key: "value" + kubernetes.io/arch: amd64 - equal: path: spec.template.spec.affinity value: @@ -1121,6 +1123,7 @@ tests: path: spec.template.spec.nodeSelector value: key: "value" + kubernetes.io/arch: amd64 - equal: path: spec.template.spec.affinity value: diff --git a/charts/codefresh/values.yaml b/charts/codefresh/values.yaml index 466263a26..fc11733cf 100644 --- a/charts/codefresh/values.yaml +++ b/charts/codefresh/values.yaml @@ -91,7 +91,8 @@ seed: ttlSecondsAfterFinished: 300 backoffLimit: 10 affinity: {} - nodeSelector: {} + nodeSelector: + kubernetes.io/arch: amd64 podSecurityContext: {} resources: {} tolerations: [] @@ -1949,17 +1950,3 @@ seed-e2e: ci: enabled: false - -developmentChart: false - -mailer: - enabled: false - -payments: - enabled: false - -segment-reporter: - enabled: false - -salesforce-reporter: - enabled: false