feat(container): update redis docker tag to v19.5.0 #3294
Merged
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
![mchesterbot[bot]](https://avatars.githubusercontent.com/in/202745?s=60&v=4){kind=small}
mchesterbot
bot
added
type/minor
area/kubernetes
--- HelmRelease: default/redis ConfigMap: default/redis-scripts
+++ HelmRelease: default/redis ConfigMap: default/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.default.svc.cluster.local\"\
- \nREDIS_SERVICE=\"redis.default.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.default.svc.cluster.local"
+ REDIS_SERVICE="redis.default.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: default/redis StatefulSet: default/redis-node
+++ HelmRelease: default/redis StatefulSet: default/redis-node
@@ -26,13 +26,13 @@
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
app.kubernetes.io/component: node
annotations:
checksum/configmap: e470e083e9303f0e697a283609a067fa3b02d321f99519c92527543610bf37d4
checksum/health: 07a9e9f1ff08347b0d2cd65e962feb94d6390f5b64a77ed1346867af2559df4a
- checksum/scripts: a156cea924d6d913fdd98c67dd814cc8baddccd2d3d601450882ed49263587c9
+ checksum/scripts: b1107a8086108b57b02458237e19d41b4a3706e5bbdd591b5cdac2fdae649b84
checksum/secret: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
prometheus.io/port: '9121'
prometheus.io/scrape: 'true'
spec:
automountServiceAccountToken: false
securityContext:
@@ -55,13 +55,13 @@
weight: 1
nodeAffinity: null
enableServiceLinks: true
terminationGracePeriodSeconds: 30
containers:
- name: redis
- image: docker.io/bitnami/redis:7.2.4-debian-12-r13
+ image: docker.io/bitnami/redis:7.2.5-debian-12-r0
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
exec:
command:
- /bin/bash
@@ -161,13 +161,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-r10
+ image: docker.io/bitnami/redis-sentinel:7.2.5-debian-12-r0
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
exec:
command:
- /bin/bash
@@ -256,13 +256,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.59.0-debian-12-r1
+ image: docker.io/bitnami/redis-exporter:1.59.0-debian-12-r6
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
--- HelmRelease: default/redis PodDisruptionBudget: default/redis-master
+++ HelmRelease: default/redis PodDisruptionBudget: default/redis-master
@@ -0,0 +1,19 @@
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+ name: redis-master
+ namespace: default
+ labels:
+ app.kubernetes.io/instance: redis
+ app.kubernetes.io/managed-by: Helm
+ app.kubernetes.io/name: redis
+ app.kubernetes.io/component: master
+spec:
+ maxUnavailable: 1
+ selector:
+ matchLabels:
+ app.kubernetes.io/instance: redis
+ app.kubernetes.io/name: redis
+ app.kubernetes.io/component: master
+ |
--- kubernetes/apps/default/redis/app Kustomization: flux-system/cluster-apps-redis HelmRelease: default/redis
+++ kubernetes/apps/default/redis/app Kustomization: flux-system/cluster-apps-redis HelmRelease: default/redis
@@ -12,13 +12,13 @@
spec:
chart: redis
sourceRef:
kind: HelmRepository
name: bitnami-charts
namespace: flux-system
- version: 19.1.5
+ version: 19.5.0
install:
createNamespace: true
remediation:
retries: 3
interval: 30m
maxHistory: 2 |
mchesterbot
bot
force-pushed
the
renovate/redis-19.x
branch
2 times, most recently
from
91378e0 to
a72e30d
Compare
mchesterbot
bot
changed the title
mchesterbot
bot
force-pushed
the
renovate/redis-19.x
branch
11 times, most recently
from
7e7bc86 to
4977fa5
Compare
mchesterbot
bot
changed the title
mchesterbot
bot
force-pushed
the
renovate/redis-19.x
branch
2 times, most recently
from
375fc3d to
0efe0a4
Compare
mchesterbot
bot
changed the title
mchesterbot
bot
force-pushed
the
renovate/redis-19.x
branch
6 times, most recently
from
520fdad to
cc289ba
Compare
mchesterbot
bot
force-pushed
the
renovate/redis-19.x
branch
from
fe7f157 to
a65288b
Compare
mchesterbot
bot
changed the title
mchesterbot
bot
force-pushed
the
renovate/redis-19.x
branch
8 times, most recently
from
f406c18 to
d3ca712
Compare
mchesterbot
bot
changed the title
mchesterbot
bot
force-pushed
the
renovate/redis-19.x
branch
3 times, most recently
from
c2acf5f to
2a25877
Compare
mchesterbot
bot
changed the title
mchesterbot
bot
force-pushed
the
renovate/redis-19.x
branch
10 times, most recently
from
3f73761 to
663db88
Compare
mchesterbot
bot
force-pushed
the
renovate/redis-19.x
branch
from
663db88 to
bd848c8
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.5->19.5.0Release Notes
bitnami/charts (redis)
v19.5.0v19.4.0v19.3.4v19.3.3v19.3.2v19.3.1v19.3.0v19.2.0Configuration
📅 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 has been generated by Renovate Bot.