Skip to content

Commit c7db0e4

Browse files
mikhail-klimkomikhail-klimko
committed
onprem: 2.8.6
1 parent 5e59a59 commit c7db0e4

File tree

5 files changed

+109
-5
lines changed

5 files changed

+109
-5
lines changed

‎codefresh/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
description: Helm Chart for Codefresh On-Prem
33
name: codefresh
4-
version: 2.8.5
4+
version: 2.8.6
55
keywords:
66
- codefresh
77
home: https://codefresh.io/
@@ -18,8 +18,8 @@ annotations:
1818
# artifacthub.io/containsSecurityUpdates: "true"
1919
# supported kinds are added, changed, deprecated, removed, fixed and security.
2020
artifacthub.io/changes: |
21-
- kind: security
22-
description: "Contains security fixes in cf-api"
21+
- kind: added
22+
description: "Add pre-upgrade hook to enable stable feature flags in rabbitmq"
2323
dependencies:
2424
- name: cf-common
2525
repository: oci://quay.io/codefresh/charts

‎codefresh/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Codefresh On-Premises
22

3-
![Version: 2.8.5](https://img.shields.io/badge/Version-2.8.5-informational?style=flat-square) ![AppVersion: 2.8.0](https://img.shields.io/badge/AppVersion-2.8.0-informational?style=flat-square)
3+
![Version: 2.8.6](https://img.shields.io/badge/Version-2.8.6-informational?style=flat-square) ![AppVersion: 2.8.0](https://img.shields.io/badge/AppVersion-2.8.0-informational?style=flat-square)
44

55
Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/getting-started/intro-to-codefresh/) to Kubernetes.
66

@@ -2595,6 +2595,7 @@ After platform upgrade, Consul fails with the error `refusing to rejoin cluster
25952595
| hooks | object | See below | Pre/post-upgrade Job hooks. |
25962596
| hooks.consul | object | `{"affinity":{},"enabled":true,"image":{"registry":"us-docker.pkg.dev/codefresh-inc/public-gcr-io","repository":"codefresh/kubectl","tag":"1.33.0"},"nodeSelector":{},"podSecurityContext":{},"resources":{},"tolerations":[]}` | Recreates `consul-headless` service due to duplicated ports in Service during the upgrade. |
25972597
| hooks.mongodb | object | `{"affinity":{},"enabled":true,"image":{"registry":"us-docker.pkg.dev/codefresh-inc/public-gcr-io","repository":"codefresh/mongosh","tag":"2.5.0"},"nodeSelector":{},"podSecurityContext":{},"resources":{},"tolerations":[]}` | Updates images in `system/default` runtime. |
2598+
| hooks.rabbitmq | object | `{"affinity":{},"enabled":true,"image":{"registry":"quay.io","repository":"codefresh/codefresh-shell","tag":"0.0.25-featadd-rabbitmqadmin"},"nodeSelector":{},"podSecurityContext":{},"resources":{},"tolerations":[]}` | Enable stable feature flags in RabbitMQ. |
25982599
| imageCredentials | object | `{}` | Credentials for Image Pull Secret object |
25992600
| ingress | object | `{"annotations":{"nginx.ingress.kubernetes.io/service-upstream":"true","nginx.ingress.kubernetes.io/ssl-redirect":"false","nginx.org/redirect-to-https":"false"},"enabled":true,"ingressClassName":"nginx-codefresh","labels":{},"nameOverride":"","services":{"internal-gateway":["/"]},"tls":{"cert":"","enabled":false,"existingSecret":"","key":"","secretName":"star.codefresh.io"}}` | Ingress |
26002601
| ingress-nginx | object | See below | ingress-nginx Ref: https://github.com/kubernetes/ingress-nginx/blob/main/charts/ingress-nginx/values.yaml |

‎codefresh/templates/hooks/pre-upgrade/enable-stable-flags-rabbitmq-job.yaml

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{{- if and .Values.hooks.rabbitmq.enabled .Values.rabbitmq.enabled }}
2+
{{- $libTemplateName := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
3+
{{- $tolerations := .Values.hooks.consul.tolerations | default list }}
4+
{{- $globalTolerations := .Values.global.tolerations | default list }}
5+
{{- $allToleration := concat $globalTolerations $tolerations }}
6+
{{- $affinity := .Values.hooks.consul.affinity | default dict }}
7+
{{- $globalAffinity := .Values.global.affinity | default dict }}
8+
{{- $allAffinity := mergeOverwrite $globalAffinity $affinity }}
9+
{{- $nodeSelector := .Values.hooks.consul.nodeSelector | default dict }}
10+
{{- $globalNodeSelector := .Values.global.nodeSelector | default dict }}
11+
{{- $allNodeSelector := mergeOverwrite $globalNodeSelector $nodeSelector }}
12+
---
13+
apiVersion: batch/v1
14+
kind: Job
15+
metadata:
16+
name: {{ template "codefresh.fullname" . }}-rabbitmq-enable-stable-flags
17+
labels:
18+
{{ include "codefresh.labels" . | nindent 4 }}
19+
annotations:
20+
helm.sh/hook: pre-upgrade
21+
helm.sh/hook-weight: "5"
22+
helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation,hook-failed
23+
spec:
24+
ttlSecondsAfterFinished: 300
25+
backoffLimit: 0
26+
template:
27+
metadata:
28+
name: {{ template "codefresh.fullname" . }}-rabbitmq-enable-stable-flags
29+
labels:
30+
{{ include "codefresh.labels" . | nindent 8 }}
31+
spec:
32+
serviceAccountName: {{ template "codefresh.fullname" . }}-rabbitmq-enable-stable-flags
33+
{{- include (printf "%s.image.pullSecrets" $libTemplateName ) . | nindent 6 }}
34+
containers:
35+
- name: {{ template "codefresh.fullname" . }}-rabbitmq-enable-stable-flags
36+
image: {{ include (printf "%s.image.name" $libTemplateName) (dict "image" .Values.hooks.rabbitmq.image "context" .) }}
37+
env:
38+
- name: RABBITMQADMIN_TARGET_HOST
39+
valueFrom:
40+
secretKeyRef:
41+
name: {{ template "codefresh.fullname" . }}-rabbitmq-enable-stable-flags
42+
key: RABBITMQADMIN_TARGET_HOST
43+
- name: RABBITMQADMIN_USERNAME
44+
valueFrom:
45+
secretKeyRef:
46+
name: {{ template "codefresh.fullname" . }}-rabbitmq-enable-stable-flags
47+
key: RABBITMQADMIN_USERNAME
48+
- name: RABBITMQADMIN_PASSWORD
49+
valueFrom:
50+
secretKeyRef:
51+
name: {{ template "codefresh.fullname" . }}-rabbitmq-enable-stable-flags
52+
key: RABBITMQADMIN_PASSWORD
53+
command:
54+
- /bin/bash
55+
- -c
56+
- |
57+
rabbitmqadmin \
58+
--host=$RABBITMQADMIN_TARGET_HOST \
59+
--username=$RABBITMQADMIN_USERNAME \
60+
--password=$RABBITMQADMIN_PASSWORD \
61+
feature_flags enable_all
62+
resources:
63+
{{- toYaml .Values.hooks.rabbitmq.resources | nindent 10 }}
64+
{{- with $allNodeSelector }}
65+
nodeSelector:
66+
{{- toYaml . | nindent 8 }}
67+
{{- end }}
68+
{{- with $allAffinity }}
69+
affinity:
70+
{{- toYaml . | nindent 8}}
71+
{{- end }}
72+
{{- with $allToleration }}
73+
tolerations:
74+
{{- toYaml . | nindent 6 }}
75+
{{- end }}
76+
restartPolicy: OnFailure
77+
{{- end }}

‎codefresh/templates/hooks/pre-upgrade/enable-stable-flags-rabbitmq-secret.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{{- if and .Values.hooks.rabbitmq.enabled .Values.rabbitmq.enabled }}
2+
{{- $libTemplateName := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
3+
---
4+
apiVersion: v1
5+
kind: Secret
6+
metadata:
7+
name: {{ template "codefresh.fullname" . }}-rabbitmq-enable-stable-flags
8+
labels:
9+
{{ include "codefresh.labels" . | nindent 4 }}
10+
type: Opaque
11+
data:
12+
RABBITMQADMIN_TARGET_HOST: {{ (printf "%s-%s" .Release.Name (coalesce .Values.global.rabbitService .Values.global.rabbitmqService) | lower) | b64enc | quote }}
13+
RABBITMQADMIN_USERNAME: {{ .Values.rabbitmq.auth.username | b64enc | quote }}
14+
RABBITMQADMIN_PASSWORD: {{ .Values.rabbitmq.auth.password | b64enc | quote }}
15+
{{- end }}

‎codefresh/values.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,18 @@ hooks:
465465
podSecurityContext: {}
466466
resources: {}
467467
tolerations: []
468-
468+
# -- Enable stable feature flags in RabbitMQ.
469+
rabbitmq:
470+
enabled: true
471+
image:
472+
registry: quay.io
473+
repository: codefresh/codefresh-shell
474+
tag: 0.0.25-featadd-rabbitmqadmin
475+
affinity: {}
476+
nodeSelector: {}
477+
podSecurityContext: {}
478+
resources: {}
479+
tolerations: []
469480

470481
# -- Maintenance postgresql clean job.
471482
# Removes a certain number of the last records in the event store table.

0 commit comments

Comments
 (0)