chore(authelia): Update redis Docker tag to v20 #24
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
SIMULATAN-Bot
force-pushed
the
renovate/authelia/redis-20.x
branch
2 times, most recently
from
bdc377b to
8aa4c26
Compare
SIMULATAN-Bot
force-pushed
the
renovate/authelia/redis-20.x
branch
from
8aa4c26 to
d70732e
Compare
Argo CD Diff PreviewSummary: {base => target}/authelia | 88 +++++++++++++++++++++++++----------------------
1 file changed, 47 insertions(+), 41 deletions(-)Diff:diff --git base/authelia target/authelia
index 242c16e..b81eade 100644
--- base/authelia
+++ target/authelia
@@ -549,23 +549,23 @@ data:
sentinel failover-timeout mymaster 180000
sentinel parallel-syncs mymaster 1
# User-supplied sentinel configuration:
# End of sentinel configuration
kind: ConfigMap
metadata:
labels:
app.kubernetes.io/instance: authelia-redis
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
- app.kubernetes.io/version: 7.2.5
+ app.kubernetes.io/version: 7.4.1
argocd.argoproj.io/instance: authelia
- helm.sh/chart: redis-19.6.4
+ helm.sh/chart: redis-20.5.0
name: authelia-redis-configuration
namespace: auth
---
apiVersion: v1
data:
parse_sentinels.awk: |-
/ip/ {FOUND_IP=1}
/port/ {FOUND_PORT=1}
/runid/ {FOUND_RUNID=1}
@@ -690,41 +690,44 @@ data:
if [ "$response" != "PONG" ]; then
echo "$response"
exit 1
fi
kind: ConfigMap
metadata:
labels:
app.kubernetes.io/instance: authelia-redis
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
- app.kubernetes.io/version: 7.2.5
+ app.kubernetes.io/version: 7.4.1
argocd.argoproj.io/instance: authelia
- helm.sh/chart: redis-19.6.4
+ helm.sh/chart: redis-20.5.0
name: authelia-redis-health
namespace: auth
---
apiVersion: v1
data:
prestop-redis.sh: |
#!/bin/bash
. /opt/bitnami/scripts/libvalidations.sh
. /opt/bitnami/scripts/libos.sh
run_redis_command() {
+ local args=("-h" "127.0.0.1")
if is_boolean_yes "$REDIS_TLS_ENABLED"; then
- redis-cli -h 127.0.0.1 -p "$REDIS_TLS_PORT" --tls --cert "$REDIS_TLS_CERT_FILE" --key "$REDIS_TLS_KEY_FILE" --cacert "$REDIS_TLS_CA_FILE" "$@"
+ args+=("-p" "$REDIS_TLS_PORT" "--tls" "--cert" "$REDIS_TLS_CERT_FILE" "--key" "$REDIS_TLS_KEY_FILE")
+ [ -n "$REDIS_TLS_CA_FILE" ] && args+=("--cacert" "$REDIS_TLS_CA_FILE")
else
- redis-cli -h 127.0.0.1 -p "$REDIS_PORT" "$@"
+ args+=("-p" "$REDIS_PORT")
fi
+ redis-cli "${args[@]}" "$@"
}
is_master() {
REDIS_ROLE=$(run_redis_command role | head -1)
[[ "$REDIS_ROLE" == "master" ]]
}
HEADLESS_SERVICE="authelia-redis-headless.auth.svc.cluster.local"
get_full_hostname() {
hostname="$1"
@@ -873,48 +876,51 @@ data:
HEADLESS_SERVICE="authelia-redis-headless.auth.svc.cluster.local"
if [ -n "$REDIS_EXTERNAL_MASTER_HOST" ]; then
REDIS_SERVICE="$REDIS_EXTERNAL_MASTER_HOST"
else
REDIS_SERVICE="authelia-redis.auth.svc.cluster.local"
fi
SENTINEL_SERVICE_PORT=$(get_port "authelia-redis" "SENTINEL")
- validate_quorum() {
+
+ redis_cli_command() {
+ local timeout="${1:-0}"
+
+ local args=("-h" "$REDIS_SERVICE" "-p" "$SENTINEL_SERVICE_PORT")
+ local command="redis-cli"
if is_boolean_yes "$REDIS_TLS_ENABLED"; then
- quorum_info_command="redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel master mymaster"
- else
- quorum_info_command="redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel master mymaster"
+ args+=("--tls" "--cert" "$REDIS_TLS_CERT_FILE" "--key" "$REDIS_TLS_KEY_FILE")
+ [ -n "$REDIS_TLS_CA_FILE" ] && args+=("--cacert" "$REDIS_TLS_CA_FILE")
+ fi
+ if [ "$timeout" -gt 0 ]; then
+ command="timeout $timeout $command"
fi
+
+ echo " $command ${args[*]}"
+ }
+
+ validate_quorum() {
+ quorum_info_command="$(redis_cli_command) sentinel master mymaster"
info "about to run the command: $quorum_info_command"
eval $quorum_info_command | grep -Fq "s_down"
}
trigger_manual_failover() {
- if is_boolean_yes "$REDIS_TLS_ENABLED"; then
- failover_command="redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel failover mymaster"
- else
- failover_command="redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel failover mymaster"
- fi
-
+ failover_command="$(redis_cli_command) sentinel failover mymaster"
info "about to run the command: $failover_command"
eval $failover_command
}
get_sentinel_master_info() {
- if is_boolean_yes "$REDIS_TLS_ENABLED"; then
- sentinel_info_command="timeout 90 redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT --tls --cert ${REDIS_TLS_CERT_FILE} --key ${REDIS_TLS_KEY_FILE} --cacert ${REDIS_TLS_CA_FILE} sentinel get-master-addr-by-name mymaster"
- else
- sentinel_info_command="timeout 90 redis-cli -h $REDIS_SERVICE -p $SENTINEL_SERVICE_PORT sentinel get-master-addr-by-name mymaster"
- fi
-
+ sentinel_info_command="$(redis_cli_command 90) sentinel get-master-addr-by-name mymaster"
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}")"
[[ -f $REDIS_MASTER_PASSWORD_FILE ]] && export REDIS_MASTER_PASSWORD="$(< "${REDIS_MASTER_PASSWORD_FILE}")"
# check if there is a master
master_in_persisted_conf="$(get_full_hostname "$HOSTNAME")"
master_port_in_persisted_conf="$REDIS_MASTER_PORT_NUMBER"
@@ -1136,23 +1142,23 @@ data:
echo "sentinel announce-port $SERVPORT" >> /opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf
echo "sentinel announce-ip $(get_full_hostname "$HOSTNAME")" >> /opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf
mv /opt/bitnami/redis-sentinel/etc/prepare-sentinel.conf /opt/bitnami/redis-sentinel/etc/sentinel.conf
exec redis-server /opt/bitnami/redis-sentinel/etc/sentinel.conf --sentinel
kind: ConfigMap
metadata:
labels:
app.kubernetes.io/instance: authelia-redis
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
- app.kubernetes.io/version: 7.2.5
+ app.kubernetes.io/version: 7.4.1
argocd.argoproj.io/instance: authelia
- helm.sh/chart: redis-19.6.4
+ helm.sh/chart: redis-20.5.0
name: authelia-redis-scripts
namespace: auth
---
apiVersion: v1
kind: Service
metadata:
labels:
app.kubernetes.io/instance: authelia
app.kubernetes.io/managed-by: Helm
@@ -1176,23 +1182,23 @@ spec:
---
apiVersion: v1
kind: Service
metadata:
labels:
app.kubernetes.io/component: node
app.kubernetes.io/instance: authelia-redis
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
- app.kubernetes.io/version: 7.2.5
+ app.kubernetes.io/version: 7.4.1
argocd.argoproj.io/instance: authelia
- helm.sh/chart: redis-19.6.4
+ helm.sh/chart: redis-20.5.0
name: authelia-redis
namespace: auth
spec:
ports:
- name: tcp-redis
nodePort: null
port: 6379
targetPort: 6379
- name: tcp-sentinel
nodePort: null
@@ -1206,23 +1212,23 @@ spec:
type: ClusterIP
---
apiVersion: v1
kind: Service
metadata:
labels:
app.kubernetes.io/instance: authelia-redis
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
- app.kubernetes.io/version: 7.2.5
+ app.kubernetes.io/version: 7.4.1
argocd.argoproj.io/instance: authelia
- helm.sh/chart: redis-19.6.4
+ helm.sh/chart: redis-20.5.0
name: authelia-redis-headless
namespace: auth
spec:
clusterIP: None
ports:
- name: tcp-redis
port: 6379
targetPort: redis
- name: tcp-sentinel
port: 26379
@@ -1235,23 +1241,23 @@ spec:
---
apiVersion: v1
automountServiceAccountToken: false
kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/instance: authelia-redis
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
- app.kubernetes.io/version: 7.2.5
+ app.kubernetes.io/version: 7.4.1
argocd.argoproj.io/instance: authelia
- helm.sh/chart: redis-19.6.4
+ helm.sh/chart: redis-20.5.0
name: authelia-redis
namespace: auth
---
apiVersion: apps/v1
kind: DaemonSet
metadata:
labels:
app.kubernetes.io/instance: authelia
app.kubernetes.io/managed-by: Helm
@@ -1416,48 +1422,48 @@ spec:
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
labels:
app.kubernetes.io/component: node
app.kubernetes.io/instance: authelia-redis
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
- app.kubernetes.io/version: 7.2.5
+ app.kubernetes.io/version: 7.4.1
argocd.argoproj.io/instance: authelia
- helm.sh/chart: redis-19.6.4
+ helm.sh/chart: redis-20.5.0
name: authelia-redis-node
namespace: auth
spec:
replicas: 3
revisionHistoryLimit: 10
selector:
matchLabels:
app.kubernetes.io/component: node
app.kubernetes.io/instance: authelia-redis
app.kubernetes.io/name: redis
serviceName: authelia-redis-headless
template:
metadata:
annotations:
checksum/configmap: 2484d556b4098e6306f844e7921711d247494614977bb5d0d5b7f34c52064ca7
checksum/health: d626f1cf63e2ea3e4d4206c57ff10b4eba5530de26431ac09f484ae8d13d3196
- checksum/scripts: b2648e98edf560eec1aa3b25b0d975236f7d41e3ed7167b2dfd29342bef8990d
+ checksum/scripts: 3db4f92b5596bcaa2d9a98ccfc2c4c3baa253f235eb2379721f5ba87f17909c0
checksum/secret: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
labels:
app.kubernetes.io/component: node
app.kubernetes.io/instance: authelia-redis
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
- app.kubernetes.io/version: 7.2.5
- helm.sh/chart: redis-19.6.4
+ app.kubernetes.io/version: 7.4.1
+ helm.sh/chart: redis-20.5.0
spec:
affinity:
nodeAffinity: null
podAffinity: null
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
labelSelector:
matchLabels:
app.kubernetes.io/component: node
@@ -1482,21 +1488,21 @@ spec:
- name: REDIS_TLS_ENABLED
value: "no"
- name: REDIS_PORT
value: "6379"
- name: REDIS_SENTINEL_TLS_ENABLED
value: "no"
- name: REDIS_SENTINEL_PORT
value: "26379"
- name: REDIS_DATA_DIR
value: /data
- image: docker.io/bitnami/redis:7.2.5-debian-12-r4
+ image: docker.io/bitnami/redis:7.4.1-debian-12-r2
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
exec:
command:
- /bin/bash
- -c
- /opt/bitnami/scripts/start-scripts/prestop-redis.sh
livenessProbe:
exec:
@@ -1580,21 +1586,21 @@ spec:
- /bin/bash
env:
- name: BITNAMI_DEBUG
value: "false"
- name: ALLOW_EMPTY_PASSWORD
value: "yes"
- name: REDIS_SENTINEL_TLS_ENABLED
value: "no"
- name: REDIS_SENTINEL_PORT
value: "26379"
- image: docker.io/bitnami/redis-sentinel:7.2.5-debian-12-r4
+ image: docker.io/bitnami/redis-sentinel:7.4.1-debian-12-r2
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
exec:
command:
- /bin/bash
- -c
- /opt/bitnami/scripts/start-scripts/prestop-sentinel.sh
livenessProbe:
exec:
@@ -1767,23 +1773,23 @@ spec:
namespace: auth
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
labels:
app.kubernetes.io/instance: authelia-redis
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
- app.kubernetes.io/version: 7.2.5
+ app.kubernetes.io/version: 7.4.1
argocd.argoproj.io/instance: authelia
- helm.sh/chart: redis-19.6.4
+ helm.sh/chart: redis-20.5.0
name: authelia-redis
namespace: auth
spec:
egress:
- {}
ingress:
- ports:
- port: 6379
- port: 26379
podSelector:
@@ -1796,23 +1802,23 @@ spec:
---
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
labels:
app.kubernetes.io/component: node
app.kubernetes.io/instance: authelia-redis
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: redis
- app.kubernetes.io/version: 7.2.5
+ app.kubernetes.io/version: 7.4.1
argocd.argoproj.io/instance: authelia
- helm.sh/chart: redis-19.6.4
+ helm.sh/chart: redis-20.5.0
name: authelia-redis-node
namespace: auth
spec:
maxUnavailable: 1
selector:
matchLabels:
app.kubernetes.io/component: node
app.kubernetes.io/instance: authelia-redis
app.kubernetes.io/name: redis |
SIMULATAN-Bot
changed the title
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.6.4->20.5.0Release Notes
bitnami/charts (redis)
v20.5.0v20.4.1v20.4.0v20.3.0v20.2.2v20.2.1v20.2.0v20.1.7v20.1.6v20.1.5v20.1.4v20.1.3v20.1.2v20.1.1v20.1.0v20.0.5v20.0.4v20.0.3v20.0.2v20.0.1v20.0.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.