feat(container): update image redis to v19.6.4 #108
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![renovate[bot]](https://avatars.githubusercontent.com/in/2740?s=60&v=4){kind=small}
--- kubernetes/main/apps/database/redis/app Kustomization: flux-system/redis HelmRelease: database/redis
+++ kubernetes/main/apps/database/redis/app Kustomization: flux-system/redis HelmRelease: database/redis
@@ -13,13 +13,13 @@
spec:
chart: redis
sourceRef:
kind: HelmRepository
name: bitnami
namespace: flux-system
- version: 19.1.3
+ version: 19.6.4
install:
remediation:
retries: 3
interval: 30m
uninstall:
keepHistory: false |
--- HelmRelease: database/redis ConfigMap: database/redis-scripts
+++ HelmRelease: database/redis ConfigMap: database/redis-scripts
@@ -154,82 +154,157 @@
ARGS+=("--replicaof" "${REDIS_MASTER_HOST}" "${REDIS_MASTER_PORT_NUMBER}")
fi
ARGS+=("--protected-mode" "no")
ARGS+=("--include" "/opt/bitnami/redis/etc/replica.conf")
ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf")
exec redis-server "${ARGS[@]}"
- start-sentinel.sh: "#!/bin/bash\n\n. /opt/bitnami/scripts/libos.sh\n. /opt/bitnami/scripts/libvalidations.sh\n\
- . /opt/bitnami/scripts/libfile.sh\n\nHEADLESS_SERVICE=\"redis-headless.database.svc.cluster.local\"\
- \nREDIS_SERVICE=\"redis.database.svc.cluster.local\"\n\nget_port() {\n hostname=\"\
- $1\"\n type=\"$2\"\n\n port_var=$(echo \"${hostname^^}_SERVICE_PORT_$type\"\
- \ | sed \"s/-/_/g\")\n port=${!port_var}\n\n if [ -z \"$port\" ]; then\n\
- \ case $type in\n \"SENTINEL\")\n echo 26379\n\
- \ ;;\n \"REDIS\")\n echo 6379\n \
- \ ;;\n esac\n else\n echo $port\n fi\n}\n\nget_full_hostname()\
- \ {\n hostname=\"$1\"\n full_hostname=\"${hostname}.${HEADLESS_SERVICE}\"\
- \n echo \"${full_hostname}\"\n}\n\nSERVPORT=$(get_port \"$HOSTNAME\" \"SENTINEL\"\
- )\nREDISPORT=$(get_port \"$HOSTNAME\" \"REDIS\")\nSENTINEL_SERVICE_PORT=$(get_port\
- \ \"redis\" \"SENTINEL\")\n\nsentinel_conf_set() {\n local -r key=\"${1:?missing\
- \ key}\"\n local value=\"${2:-}\"\n\n # Sanitize inputs\n value=\"${value//\\\
- \\/\\\\\\\\}\"\n value=\"${value//&/\\\\&}\"\n value=\"${value//\\?/\\\\\
- ?}\"\n [[ \"$value\" = \"\" ]] && value=\"\\\"$value\\\"\"\n\n replace_in_file\
- \ \"/opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf\" \"^#*\\s*${key} .*\"\
- \ \"${key} ${value}\" false\n}\nsentinel_conf_add() {\n echo $'\\n'\"$@\" >>\
- \ \"/opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf\"\n}\nhost_id() {\n\
- \ echo \"$1\" | openssl sha1 | awk '{print $2}'\n}\nget_sentinel_master_info()\
- \ {\n if is_boolean_yes \"$REDIS_SENTINEL_TLS_ENABLED\"; then\n sentinel_info_command=\"\
- timeout 10 redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert\
- \ ${REDIS_SENTINEL_TLS_CERT_FILE} --key ${REDIS_SENTINEL_TLS_KEY_FILE} --cacert\
- \ ${REDIS_SENTINEL_TLS_CA_FILE} sentinel get-master-addr-by-name redis-master\"\
- \n else\n sentinel_info_command=\"timeout 10 redis-cli -h $REDIS_SERVICE\
- \ -p $SENTINEL_SERVICE_PORT sentinel get-master-addr-by-name redis-master\"\n\
- \ fi\n info \"about to run the command: $sentinel_info_command\"\n retry_while\
- \ \"eval $sentinel_info_command\" 2 5\n}\n\n[[ -f $REDIS_PASSWORD_FILE ]] && export\
- \ REDIS_PASSWORD=\"$(< \"${REDIS_PASSWORD_FILE}\")\"\n\nmaster_in_persisted_conf=\"\
- $(get_full_hostname \"$HOSTNAME\")\"\n\nif [[ -f /opt/bitnami/redis-sentinel/etc/sentinel.conf\
- \ ]]; then\n master_in_persisted_conf=\"$(awk '/monitor/ {print $4}' /opt/bitnami/redis-sentinel/etc/sentinel.conf)\"\
- \n info \"Found previous master $master_in_persisted_conf in /opt/bitnami/redis-sentinel/etc/sentinel.conf\"\
- \n debug \"$(cat /opt/bitnami/redis-sentinel/etc/sentinel.conf | grep monitor)\"\
- \nfi\nREDIS_SENTINEL_INFO=($(get_sentinel_master_info))\nif [ \"$?\" -eq \"0\"\
- \ ]; then\n # current master's host and port obtained from other Sentinel\n\
- \ info \"printing REDIS_SENTINEL_INFO=(${REDIS_SENTINEL_INFO[0]},${REDIS_SENTINEL_INFO[1]})\"\
- \n REDIS_MASTER_HOST=${REDIS_SENTINEL_INFO[0]}\n REDIS_MASTER_PORT_NUMBER=${REDIS_SENTINEL_INFO[1]}\n\
- else\n REDIS_MASTER_HOST=\"$master_in_persisted_conf\"\n REDIS_MASTER_PORT_NUMBER=\"\
- $REDISPORT\"\nfi\nif [[ \"$REDIS_MASTER_HOST\" == \"$(get_full_hostname \"$HOSTNAME\"\
- )\" ]]; then\n export REDIS_REPLICATION_MODE=\"master\"\nelse\n export REDIS_REPLICATION_MODE=\"\
- replica\"\nfi\n\nif [[ -n \"$REDIS_EXTERNAL_MASTER_HOST\" ]]; then\n REDIS_MASTER_HOST=\"\
- $REDIS_EXTERNAL_MASTER_HOST\"\n REDIS_MASTER_PORT_NUMBER=\"${REDIS_EXTERNAL_MASTER_PORT}\"\
- \nfi\n\n# To prevent incomplete configuration and as the redis container accesses\
- \ /opt/bitnami/redis-sentinel/etc/sentinel.conf \n# as well, prepare the new config\
- \ in `prepare-sentinel.conf` and move it atomically to the ultimate destination\
- \ when it is complete.\ncp /opt/bitnami/redis-sentinel/mounted-etc/sentinel.conf\
- \ /opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf\nprintf \"\\nsentinel\
- \ myid %s\" \"$(host_id \"$HOSTNAME\")\" >> /opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf\n\
- \nif [[ -z \"$REDIS_MASTER_HOST\" ]] || [[ -z \"$REDIS_MASTER_PORT_NUMBER\" ]]\n\
- then\n # Prevent incorrect configuration to be written to sentinel.conf\n \
- \ error \"Redis master host is configured incorrectly (host: $REDIS_MASTER_HOST,\
- \ port: $REDIS_MASTER_PORT_NUMBER)\"\n exit 1\nfi\n\nsentinel_conf_set \"sentinel\
- \ monitor\" \"redis-master \"$REDIS_MASTER_HOST\" \"$REDIS_MASTER_PORT_NUMBER\"\
- \ 2\"\n\nadd_known_sentinel() {\n hostname=\"$1\"\n ip=\"$2\"\n\n if\
- \ [[ -n \"$hostname\" && -n \"$ip\" && \"$hostname\" != \"$HOSTNAME\" ]]; then\n\
- \ sentinel_conf_add \"sentinel known-sentinel redis-master $(get_full_hostname\
- \ \"$hostname\") $(get_port \"$hostname\" \"SENTINEL\") $(host_id \"$hostname\"\
- )\"\n fi\n}\nadd_known_replica() {\n hostname=\"$1\"\n ip=\"$2\"\n\n\
- \ if [[ -n \"$ip\" && \"$(get_full_hostname \"$hostname\")\" != \"$REDIS_MASTER_HOST\"\
- \ ]]; then\n sentinel_conf_add \"sentinel known-replica redis-master $(get_full_hostname\
- \ \"$hostname\") $(get_port \"$hostname\" \"REDIS\")\"\n fi\n}\n\n# Add available\
- \ hosts on the network as known replicas & sentinels\nfor node in $(seq 0 $((3-1)));\
- \ do\n hostname=\"redis-node-$node\"\n ip=\"$(getent hosts \"$hostname.$HEADLESS_SERVICE\"\
- \ | awk '{ print $1 }')\"\n add_known_sentinel \"$hostname\" \"$ip\"\n add_known_replica\
- \ \"$hostname\" \"$ip\"\ndone\n\necho \"\" >> /opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf\n\
- echo \"sentinel announce-hostnames yes\" >> /opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf\n\
- echo \"sentinel resolve-hostnames yes\" >> /opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf\n\
- echo \"sentinel announce-port $SERVPORT\" >> /opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf\n\
- echo \"sentinel announce-ip $(get_full_hostname \"$HOSTNAME\")\" >> /opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf\n\
- mv /opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf /opt/bitnami/redis-sentinel/etc/sentinel.conf\n\
- exec redis-server /opt/bitnami/redis-sentinel/etc/sentinel.conf --sentinel\n"
+ start-sentinel.sh: |
+ #!/bin/bash
+
+ . /opt/bitnami/scripts/libos.sh
+ . /opt/bitnami/scripts/libvalidations.sh
+ . /opt/bitnami/scripts/libfile.sh
+
+ HEADLESS_SERVICE="redis-headless.database.svc.cluster.local"
+ REDIS_SERVICE="redis.database.svc.cluster.local"
+
+ get_port() {
+ hostname="$1"
+ type="$2"
+
+ port_var=$(echo "${hostname^^}_SERVICE_PORT_$type" | sed "s/-/_/g")
+ port=${!port_var}
+
+ if [ -z "$port" ]; then
+ case $type in
+ "SENTINEL")
+ echo 26379
+ ;;
+ "REDIS")
+ echo 6379
+ ;;
+ esac
+ else
+ echo $port
+ fi
+ }
+
+ get_full_hostname() {
+ hostname="$1"
+ full_hostname="${hostname}.${HEADLESS_SERVICE}"
+ echo "${full_hostname}"
+ }
+
+ SERVPORT=$(get_port "$HOSTNAME" "SENTINEL")
+ REDISPORT=$(get_port "$HOSTNAME" "REDIS")
+ SENTINEL_SERVICE_PORT=$(get_port "redis" "SENTINEL")
+
+ sentinel_conf_set() {
+ local -r key="${1:?missing key}"
+ local value="${2:-}"
+
+ # Sanitize inputs
+ value="${value//\\/\\\\}"
+ value="${value//&/\\&}"
+ value="${value//\?/\\?}"
+ [[ "$value" = "" ]] && value="\"$value\""
+
+ replace_in_file "/opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf" "^#*\s*${key} .*" "${key} ${value}" false
+ }
+ sentinel_conf_add() {
+ echo $'\n'"$@" >> "/opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf"
+ }
+ host_id() {
+ echo "$1" | openssl sha1 | awk '{print $2}'
+ }
+ get_sentinel_master_info() {
+ if is_boolean_yes "$REDIS_SENTINEL_TLS_ENABLED"; then
+ sentinel_info_command="timeout 10 redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_SENTINEL_TLS_CERT_FILE} --key ${REDIS_SENTINEL_TLS_KEY_FILE} --cacert ${REDIS_SENTINEL_TLS_CA_FILE} sentinel get-master-addr-by-name redis-master"
+ else
+ sentinel_info_command="timeout 10 redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel get-master-addr-by-name redis-master"
+ fi
+ info "about to run the command: $sentinel_info_command"
+ retry_while "eval $sentinel_info_command" 2 5
+ }
+
+ [[ -f $REDIS_PASSWORD_FILE ]] && export REDIS_PASSWORD="$(< "${REDIS_PASSWORD_FILE}")"
+
+ master_in_persisted_conf="$(get_full_hostname "$HOSTNAME")"
+
+ if [[ -f /opt/bitnami/redis-sentinel/etc/sentinel.conf ]]; then
+ master_in_persisted_conf="$(awk '/monitor/ {print $4}' /opt/bitnami/redis-sentinel/etc/sentinel.conf)"
+ info "Found previous master $master_in_persisted_conf in /opt/bitnami/redis-sentinel/etc/sentinel.conf"
+ debug "$(cat /opt/bitnami/redis-sentinel/etc/sentinel.conf | grep monitor)"
+ fi
+ REDIS_SENTINEL_INFO=($(get_sentinel_master_info))
+ if [ "$?" -eq "0" ]; then
+ # current master's host and port obtained from other Sentinel
[Diff truncated by flux-local]
--- HelmRelease: database/redis StatefulSet: database/redis-node
+++ HelmRelease: database/redis StatefulSet: database/redis-node
@@ -8,12 +8,13 @@
app.kubernetes.io/instance: redis
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
app.kubernetes.io/component: node
spec:
replicas: 3
+ revisionHistoryLimit: 10
selector:
matchLabels:
app.kubernetes.io/instance: redis
app.kubernetes.io/name: redis
app.kubernetes.io/component: node
serviceName: redis-headless
@@ -26,13 +27,13 @@
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
app.kubernetes.io/component: node
annotations:
checksum/configmap: 44827545caa1794c0c6696c4406beb71e64dd804ef278fe070efe561c4bc71b7
checksum/health: 07a9e9f1ff08347b0d2cd65e962feb94d6390f5b64a77ed1346867af2559df4a
- checksum/scripts: 32ccc4e7ace523b8dd23161349641ddef14b4cbe7299b2f342d269746faa4934
+ checksum/scripts: aae9d6391abdd7877b9bc4cc8f75cd0ab9ba7f8241335f066f04e3e94a7e7a5e
checksum/secret: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
prometheus.io/port: '9121'
prometheus.io/scrape: 'true'
spec:
automountServiceAccountToken: false
securityContext:
@@ -55,13 +56,13 @@
weight: 1
nodeAffinity: null
enableServiceLinks: true
terminationGracePeriodSeconds: 30
containers:
- name: redis
- image: docker.io/bitnami/redis:7.2.4-debian-12-r12
+ image: docker.io/bitnami/redis:7.2.5-debian-12-r4
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
exec:
command:
- /bin/bash
@@ -137,13 +138,13 @@
- sh
- -c
- /health/ping_readiness_local.sh 1
resources:
limits:
cpu: 150m
- ephemeral-storage: 1024Mi
+ ephemeral-storage: 2Gi
memory: 192Mi
requests:
cpu: 100m
ephemeral-storage: 50Mi
memory: 128Mi
volumeMounts:
@@ -161,13 +162,13 @@
mountPath: /opt/bitnami/redis/etc
subPath: app-conf-dir
- name: empty-dir
mountPath: /tmp
subPath: tmp-dir
- name: sentinel
- image: docker.io/bitnami/redis-sentinel:7.2.4-debian-12-r9
+ image: docker.io/bitnami/redis-sentinel:7.2.5-debian-12-r4
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
exec:
command:
- /bin/bash
@@ -235,13 +236,13 @@
- sh
- -c
- /health/ping_sentinel.sh 1
resources:
limits:
cpu: 150m
- ephemeral-storage: 1024Mi
+ ephemeral-storage: 2Gi
memory: 192Mi
requests:
cpu: 100m
ephemeral-storage: 50Mi
memory: 128Mi
volumeMounts:
@@ -256,13 +257,13 @@
mountPath: /opt/bitnami/redis-sentinel/etc
- name: redis-data
mountPath: /data
- name: config
mountPath: /opt/bitnami/redis-sentinel/mounted-etc
- name: metrics
- image: docker.io/bitnami/redis-exporter:1.58.0-debian-12-r7
+ image: docker.io/bitnami/redis-exporter:1.62.0-debian-12-r2
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
@@ -306,13 +307,13 @@
httpGet:
path: /
port: metrics
resources:
limits:
cpu: 150m
- ephemeral-storage: 1024Mi
+ ephemeral-storage: 2Gi
memory: 192Mi
requests:
cpu: 100m
ephemeral-storage: 50Mi
memory: 128Mi
volumeMounts:
--- HelmRelease: database/redis PodDisruptionBudget: database/redis-node
+++ HelmRelease: database/redis PodDisruptionBudget: database/redis-node
@@ -0,0 +1,19 @@
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+ name: redis-node
+ namespace: database
+ labels:
+ app.kubernetes.io/instance: redis
+ app.kubernetes.io/managed-by: Helm
+ app.kubernetes.io/name: redis
+ app.kubernetes.io/component: node
+spec:
+ maxUnavailable: 1
+ selector:
+ matchLabels:
+ app.kubernetes.io/instance: redis
+ app.kubernetes.io/name: redis
+ app.kubernetes.io/component: node
+ |
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
ecc9cc1 to
376292c
Compare
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
376292c to
4a9a391
Compare
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
4a9a391 to
d5aef0e
Compare
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
d5aef0e to
209740d
Compare
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
209740d to
d9f661f
Compare
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
d9f661f to
7e0fea8
Compare
renovate
bot
changed the title
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
7e0fea8 to
c396874
Compare
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
c396874 to
82e279f
Compare
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
2 times, most recently
from
9115a09 to
02cd5c7
Compare
renovate
bot
changed the title
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
02cd5c7 to
3e549b6
Compare
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
2 times, most recently
from
8b341b0 to
7387c05
Compare
renovate
bot
changed the title
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
7387c05 to
6fc69e8
Compare
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
6fc69e8 to
9ac3c49
Compare
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
9ac3c49 to
ae39a77
Compare
renovate
bot
changed the title
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
2 times, most recently
from
017ccc3 to
93bac02
Compare
renovate
bot
changed the title
renovate
bot
force-pushed
the
renovate/redis-19.x
branch
from
93bac02 to
48c36b5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains the following updates:
19.1.3->19.6.4Release Notes
bitnami/charts (redis)
v19.6.4v19.6.3v19.6.2v19.6.1v19.6.0v19.5.5v19.5.4v19.5.3v19.5.2v19.5.1v19.5.0v19.4.0v19.3.4v19.3.3v19.3.2v19.3.1v19.3.0v19.2.0v19.1.5Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
This PR was generated by Mend Renovate. View the repository job log.