DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases 1 Wiki Activity

refactor(charts): BREAKING CHANGE (#2836)

Browse Source 
* Update Apps with new Common version

* Patch with the secret fixes from common

* fix amd
This commit is contained in:
Kjeld Schouten-Lebbing
2022-06-07 19:41:19 +02:00
committed by GitHub
parent e4911cf0b1
commit 5529c2a3af
1546 changed files with 10467 additions and 3650 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/dependency/redis/Chart.yaml
+2 -2
View File
@@ -3,7 +3,7 @@ appVersion: "6.2.7"
dependencies:
- name: common
repository: https://library-charts.truecharts.org
version: 9.3.29
version: 10.0.8
deprecated: false
description: Open source, advanced key-value store.
home: https://github.com/truecharts/apps/tree/master/charts/dependency/redis
@@ -22,7 +22,7 @@ sources:
- https://github.com/bitnami/bitnami-docker-redis
- http://redis.io/
type: application
version: 2.0.83
version: 3.0.0
annotations:
truecharts.org/catagories: |
- database
charts/dependency/redis/templates/common.yaml
+1 -1
View File
@@ -1,2 +1,2 @@
{{ include "common.all" . }}
{{ include "tc.common.loader.all" . }}
charts/dependency/redis/templates/health-configmap.yaml
-79
View File
@@ -1,79 +0,0 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: redis-health
labels:
{{- include "common.labels" . | nindent 4 }}
annotations:
{{- with .Values.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
data:
ping_readiness_local.sh: |-
#!/bin/bash
[[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD"
response=$(
timeout -s 3 $1 \
redis-cli \
-h localhost \
-p $REDIS_PORT \
ping
)
if [ "$response" != "PONG" ]; then
echo "failed to connect using password: $REDIS_PASSWORD response: $response"
exit 1
fi
ping_liveness_local.sh: |-
#!/bin/bash
[[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD"
response=$(
timeout -s 3 $1 \
redis-cli \
-h localhost \
-p $REDIS_PORT \
ping
)
if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
echo "$response"
exit 1
fi
ping_readiness_master.sh: |-
#!/bin/bash
[[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD"
response=$(
timeout -s 3 $1 \
redis-cli \
-h $REDIS_MASTER_HOST \
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
fi
ping_liveness_master.sh: |-
#!/bin/bash
[[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD"
response=$(
timeout -s 3 $1 \
redis-cli \
-h $REDIS_MASTER_HOST \
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
echo "$response"
exit 1
fi
ping_readiness_local_and_master.sh: |-
script_dir="$(dirname "$0")"
exit_status=0
"$script_dir/ping_readiness_local.sh" $1 || exit_status=$?
"$script_dir/ping_readiness_master.sh" $1 || exit_status=$?
exit $exit_status
ping_liveness_local_and_master.sh: |-
script_dir="$(dirname "$0")"
exit_status=0
"$script_dir/ping_liveness_local.sh" $1 || exit_status=$?
"$script_dir/ping_liveness_master.sh" $1 || exit_status=$?
exit $exit_status
charts/dependency/redis/templates/secret.yaml
-13
View File
@@ -1,13 +0,0 @@
apiVersion: v1
kind: Secret
metadata:
name: {{ include "common.names.fullname" . }}
labels:
{{- include "common.labels" . | nindent 4 }}
annotations:
{{- with .Values.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
type: Opaque
data:
redis-password: {{ ( .Values.redisPassword | default "nothing" ) | b64enc | quote }}
charts/dependency/redis/values.yaml
+87 -14
View File
@@ -1,7 +1,7 @@
image:
repository: ghcr.io/truecharts/redis
pullPolicy: IfNotPresent
tag: v6.2.7@sha256:692ee212a2bfe72367f9b568abbc0e73092c440dcb93497f4deebd89dd174079
tag: v7.0.0@sha256:5ca358fcb215690d5dcc1a447b9884cc903003457ef2507cb33ec7dc555a4710
controller:
# -- Set the controller type.
@@ -30,24 +30,97 @@ securityContext:
podSecurityContext:
runAsGroup: 0
env:
- name: REDIS_REPLICATION_MODE
value: master
- name: ALLOW_EMPTY_PASSWORD
value: "yes"
configmap:
health:
enabled: true
data:
ping_readiness_local.sh: |-
#!/bin/bash
[[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD"
response=$(
timeout -s 3 $1 \
redis-cli \
-h localhost \
-p $REDIS_PORT \
ping
)
if [ "$response" != "PONG" ]; then
echo "failed to connect using password: $REDIS_PASSWORD response: $response"
exit 1
fi
ping_liveness_local.sh: |-
#!/bin/bash
[[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD"
response=$(
timeout -s 3 $1 \
redis-cli \
-h localhost \
-p $REDIS_PORT \
ping
)
if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
echo "$response"
exit 1
fi
ping_readiness_master.sh: |-
#!/bin/bash
[[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD"
response=$(
timeout -s 3 $1 \
redis-cli \
-h $REDIS_MASTER_HOST \
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
fi
ping_liveness_master.sh: |-
#!/bin/bash
[[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD"
response=$(
timeout -s 3 $1 \
redis-cli \
-h $REDIS_MASTER_HOST \
-p $REDIS_MASTER_PORT_NUMBER \
ping
)
if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
echo "$response"
exit 1
fi
ping_readiness_local_and_master.sh: |-
script_dir="$(dirname "$0")"
exit_status=0
"$script_dir/ping_readiness_local.sh" $1 || exit_status=$?
"$script_dir/ping_readiness_master.sh" $1 || exit_status=$?
exit $exit_status
ping_liveness_local_and_master.sh: |-
script_dir="$(dirname "$0")"
exit_status=0
"$script_dir/ping_liveness_local.sh" $1 || exit_status=$?
"$script_dir/ping_liveness_master.sh" $1 || exit_status=$?
exit $exit_status
envTpl:
secret:
credentials:
enabled: true
data:
redis-password: '{{ ( .Values.redisPassword | default "nothing" ) }}'
env:
REDIS_REPLICATION_MODE: master
ALLOW_EMPTY_PASSWORD: "yes"
REDIS_PORT: "{{ .Values.service.main.ports.main.targetPort }}"
REDIS_PASSWORD:
secretKeyRef:
name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}'
key: "redis-password"
redisPassword: "testpass"
existingSecret: ""
envValueFrom:
REDIS_PASSWORD:
secretKeyRef:
name: '{{ ( tpl .Values.existingSecret $ ) | default ( include "common.names.fullname" . ) }}'
key: "redis-password"
service:
main:
ports:
@@ -130,4 +203,4 @@ persistence:
volumeSpec:
configMap:
defaultMode: 0755
name: redis-health
name: '{{ include "tc.common.names.fullname" . }}-health'