chore(valkey): use valkey replace redis

Author: duanhongyi

Makefile

@@ -2,7 +2,7 @@
 # Some uses for short name:
 # - Container image name
 # - Kubernetes service, rc, pod, secret, volume names
-SHORT_NAME := redis
+SHORT_NAME := valkey
 DRYCC_REGISTRY ?= ${DEV_REGISTRY}
 IMAGE_PREFIX ?= drycc
 PLATFORM ?= linux/amd64,linux/arm64
@@ -29,7 +29,8 @@ podman-build:
 	podman build --build-arg CODENAME=${CODENAME} -t ${IMAGE} rootfs
 	podman tag ${IMAGE} ${MUTABLE_IMAGE}
 
-test: test-style
+test: podman-build test-style
+	./_test/test.sh ${VERSION}
 
 test-style:
 	${DEV_ENV_CMD} shellcheck $(SHELL_SCRIPTS)

README.md

@@ -1,9 +1,9 @@
-# Drycc Redis
-[![Build Status](https://woodpecker.drycc.cc/api/badges/drycc/redis/status.svg)](https://woodpecker.drycc.cc/drycc/redis)
+# Drycc Valkey
+[![Build Status](https://woodpecker.drycc.cc/api/badges/drycc/valkey/status.svg)](https://woodpecker.drycc.cc/drycc/valkey)
 
 Drycc (pronounced DAY-iss) Workflow is an open source Platform as a Service (PaaS) that adds a developer-friendly layer to any [Kubernetes](http://kubernetes.io) cluster, making it easy to deploy and manage applications on your own servers.
 
 ## Description
-A Container image for running standalone (not clustered) Redis on a Kubernetes cluster.
+A Container image for running standalone (not clustered) Valkey on a Kubernetes cluster.
 
 [v2.18]: https://github.com/drycc/workflow/releases/tag/v2.18.0

_test/test.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+VERSION="$1"
+CONTAINER_NAME="valkey-benchmark"
+
+function clean_before_exit {
+    # delay before exiting, so stdout/stderr flushes through the logging system
+    clean-valkey
+}
+trap clean_before_exit EXIT
+
+start-valkey() {
+    podman run -d --name "$CONTAINER_NAME" --rm registry.drycc.cc/drycc/valkey:$VERSION
+}
+
+clean-valkey() {
+    podman rm -f "$CONTAINER_NAME"
+}
+
+clean-valkey
+start-valkey
+podman exec "$CONTAINER_NAME" /opt/drycc/valkey/bin/valkey-benchmark

charts/redis/templates/redis-secret-creds.yaml

@@ -1,12 +1,12 @@
-name: redis
-home: https://github.com/drycc/redis
+name: valkey
+home: https://github.com/drycc/valkey
 apiVersion: v2
 appVersion: 1.0.0
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
     version: ~1.1.2
-description: A Redis database for use inside a Kubernetes cluster.
+description: A Valkey database for use inside a Kubernetes cluster.
 maintainers:
   - name: Drycc Team
     email: engineering@drycc.com

charts/redis/Chart.yaml charts/valkey/Chart.yamlcharts/redis/Chart.yaml renamed to charts/valkey/Chart.yaml

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: valkey-creds
+  labels:
+    app: drycc-valkey
+    heritage: drycc
+data: 
+  {{ if eq .Values.global.valkeyLocation "on-cluster"}}
+  {{- $valkeyAddrs := (list ) }}
+  {{- $valkeyNodeCount := .Values.replicas | int }}
+  {{- range $i := until $valkeyNodeCount }}
+  {{- $valkeyAddrs = (append $valkeyAddrs (printf "drycc-valkey-%d.drycc-valkey.%s.svc.%s:6379" $i $.Release.Namespace $.Values.global.clusterDomain)) }}
+  {{- end -}}
+  addrs: {{ join "," $valkeyAddrs | b64enc }}
+  password: {{ include "common.secrets.lookup" (dict "secret" "valkey-creds" "key" "password" "defaultValue" (randAlphaNum 32) "context" $) }}
+  {{ else if eq .Values.global.valkeyLocation "off-cluster"}}
+  addrs: {{ .Values.addrs | b64enc }}
+  password: {{ .Values.password | b64enc }}
+  {{ end }}

charts/valkey/templates/valkey-secret-creds.yaml

@@ -1,30 +1,30 @@
-{{- if eq .Values.global.redisLocation "on-cluster" }}
+{{- if eq .Values.global.valkeyLocation "on-cluster" }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: drycc-redis
+  name: drycc-valkey
   labels:
     heritage: drycc
   annotations:
     component.drycc.cc/version: {{ .Values.imageTag }}
 spec:
-  serviceName: drycc-redis
+  serviceName: drycc-valkey
   replicas: {{ .Values.replicas }}
   selector:
     matchLabels:
-      app: drycc-redis
+      app: drycc-valkey
   template:
     metadata:
       labels: {{- include "common.labels.standard" . | nindent 8 }}
-        app: drycc-redis
+        app: drycc-valkey
     spec:
       affinity:
         podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAffinityPreset.type "component" "" "extraMatchLabels" .Values.podAffinityPreset.extraMatchLabels "topologyKey" "" "context" $) | nindent 10 }}
         podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset.type "component" "" "extraMatchLabels" .Values.podAntiAffinityPreset.extraMatchLabels "topologyKey" "" "context" $) | nindent 10 }}
         nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values ) | nindent 10 }}
       containers:
-      - name: drycc-redis
-        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/redis:{{ .Values.imageTag }}
+      - name: drycc-valkey
+        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/valkey:{{ .Values.imageTag }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
         {{- if or (.Values.limitsCpu) (.Values.limitsMemory)}}
         resources:
@@ -48,14 +48,14 @@ spec:
         ports:
         - containerPort: 6379
         env:
-        - name: DRYCC_REDIS_PASSWORD
+        - name: DRYCC_VALKEY_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: redis-creds
+              name: valkey-creds
               key: password
         {{- if .Values.persistence.enabled }}
         volumeMounts:
-        - name: redis-data
+        - name: valkey-data
           mountPath: /data
         {{- end }}
       securityContext:
@@ -65,7 +65,7 @@ spec:
   {{- if .Values.persistence.enabled }}
   volumeClaimTemplates:
   - metadata:
-      name: redis-data
+      name: valkey-data
     spec:
       accessModes: [ "ReadWriteOnce" ]
       {{- if .Values.persistence.storageClass }}

…s/redis/templates/redis-statefulset.yaml …valkey/templates/valkey-statefulset.yamlcharts/redis/templates/redis-statefulset.yaml renamed to charts/valkey/templates/valkey-statefulset.yaml charts/redis/templates/redis-statefulset.yaml renamed to charts/valkey/templates/valkey-statefulset.yaml

@@ -1,8 +1,8 @@
-{{- if eq .Values.global.redisLocation "on-cluster" }}
+{{- if eq .Values.global.valkeyLocation "on-cluster" }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: drycc-redis
+  name: drycc-valkey
   annotations:
     {{- with .Values.service.annotations }}
     {{- toYaml . | nindent 4 }}
@@ -12,5 +12,5 @@ metadata:
 spec:
   clusterIP: None
   selector:
-    app: drycc-redis
+    app: drycc-valkey
 {{- end }}

charts/redis/templates/redis-svc.yaml charts/valkey/templates/valkey-svc.yamlcharts/redis/templates/redis-svc.yaml renamed to charts/valkey/templates/valkey-svc.yaml

@@ -34,14 +34,14 @@ podAffinityPreset:
 podAntiAffinityPreset:
   type: "soft"
   extraMatchLabels:
-    app: "drycc-redis"
+    app: "drycc-valkey"
 
-# The following parameters are configured only when using an on-cluster Redis instance
+# The following parameters are configured only when using an on-cluster Valkey instance
 replicas: 1
 
-# The following parameters are configured only when using an off-cluster Redis instance
+# The following parameters are configured only when using an off-cluster Valkey instance
 addrs: "" # A list of clusters: "127.0.0.1:7001/1,127.0.0.2:7002/1"
-password: "redis password" # "" == no password
+password: "valkey password" # "" == no password
 
 # Service
 service:
@@ -55,9 +55,9 @@ persistence:
   storageClass: ""
 
 global:
-  # Set the location of Workflow's redis instance
+  # Set the location of Workflow's valkey instance
   #
   # Valid values are:
-  # - on-cluster: Run Redis within the Kubernetes cluster
-  # - off-cluster: Run Redis outside the Kubernetes cluster (configure in redis section)
-  redisLocation: "on-cluster"
+  # - on-cluster: Run Valkey within the Kubernetes cluster
+  # - off-cluster: Run Valkey outside the Kubernetes cluster (configure in valkey section)
+  valkeyLocation: "on-cluster"

charts/redis/values.yaml charts/valkey/values.yamlcharts/redis/values.yaml renamed to charts/valkey/values.yaml

@@ -4,15 +4,15 @@ FROM registry.drycc.cc/drycc/base:${CODENAME}
 ENV DRYCC_UID=1001 \
   DRYCC_GID=1001 \
   DRYCC_HOME_DIR=/data \
-  REDIS_VERSION="7.0.11"
+  VALKEY_VERSION="8.0.1"
 
 RUN groupadd drycc --gid ${DRYCC_GID} \
   && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}
 
 COPY bin/boot /bin/boot
-COPY etc/redis/redis.conf /etc/redis/redis.conf
+COPY etc/valkey/valkey.conf /etc/valkey/valkey.conf
 
-RUN install-stack redis ${REDIS_VERSION} \
+RUN install-stack valkey ${VALKEY_VERSION} \
   && rm -rf \
       /usr/share/doc \
       /usr/share/man \
@@ -27,7 +27,7 @@ RUN install-stack redis ${REDIS_VERSION} \
       /usr/lib/`echo $(uname -m)`-linux-gnu/gconv/IBM* \
       /usr/lib/`echo $(uname -m)`-linux-gnu/gconv/EBC* \
   && mkdir -p /usr/share/man/man{1..8} \
-  && chown -R ${DRYCC_UID}:${DRYCC_GID} /etc/redis ${DRYCC_HOME_DIR}
+  && chown -R ${DRYCC_UID}:${DRYCC_GID} /etc/valkey ${DRYCC_HOME_DIR}
 
 USER ${DRYCC_UID}
 WORKDIR ${DRYCC_HOME_DIR}