2026-03-06 17:19:31 +00:00
18 changed files with 113 additions and 23156 deletions
--- a/clusters/cl01tl/manifests/blocky/ConfigMap-blocky-valkey-init-scripts.yaml
+++ b/clusters/cl01tl/manifests/blocky/ConfigMap-blocky-valkey-init-scripts.yaml
@@ -46,6 +46,35 @@ data:
      echo "bind * -::*"
      echo "dir /data"
    } >>"$VALKEY_CONFIG"
+    # Replica mode configuration
+    log "Configuring replication mode"
+
+    # Use POD_INDEX from Kubernetes metadata
+    POD_INDEX=${POD_INDEX:-0}
+    IS_MASTER=false
+
+    # Check if this is pod-0 (master)
+    if [ "$POD_INDEX" = "0" ]; then
+      IS_MASTER=true
+      log "This pod (index $POD_INDEX) is configured as MASTER"
+    else
+      log "This pod (index $POD_INDEX) is configured as REPLICA"
+    fi
+
+    # Configure replica settings
+    if [ "$IS_MASTER" = "false" ]; then
+      MASTER_HOST="blocky-valkey-0.blocky-valkey-headless.blocky.svc.cluster.local"
+      MASTER_PORT="6379"
+
+      log "Configuring replica to follow master at $MASTER_HOST:$MASTER_PORT"
+
+      {
+        echo ""
+        echo "# Replica Configuration"
+        echo "replicaof $MASTER_HOST $MASTER_PORT"
+        echo "replica-announce-ip blocky-valkey-$POD_INDEX.blocky-valkey-headless.blocky.svc.cluster.local"
+      } >>"$VALKEY_CONFIG"
+    fi

    # Append extra configs if present
    if [ -f /usr/local/etc/valkey/valkey.conf ]; then
--- a/clusters/cl01tl/manifests/blocky/PersistentVolumeClaim-blocky-valkey.yaml
+++ b/clusters/cl01tl/manifests/blocky/PersistentVolumeClaim-blocky-valkey.yaml
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: blocky-valkey
-  labels:
-    helm.sh/chart: valkey-0.9.3
-    app.kubernetes.io/name: valkey
-    app.kubernetes.io/instance: blocky
-    app.kubernetes.io/version: "9.0.3"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  accessModes:
-    - ReadWriteOnce
-  volumeMode: Filesystem
-  resources:
-    requests:
-      storage: 1Gi
-  storageClassName: ceph-block
--- a/clusters/cl01tl/manifests/blocky/Service-blocky-valkey-headless.yaml
+++ b/clusters/cl01tl/manifests/blocky/Service-blocky-valkey-headless.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: blocky-valkey-headless
+  labels:
+    helm.sh/chart: valkey-0.9.3
+    app.kubernetes.io/name: valkey
+    app.kubernetes.io/instance: blocky
+    app.kubernetes.io/version: "9.0.3"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: headless
+spec:
+  type: ClusterIP
+  clusterIP: None
+  publishNotReadyAddresses: true
+  ports:
+    - name: tcp
+      port: 6379
+      targetPort: tcp
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: valkey
+    app.kubernetes.io/instance: blocky
--- a/clusters/cl01tl/manifests/blocky/Service-blocky-valkey-read.yaml
+++ b/clusters/cl01tl/manifests/blocky/Service-blocky-valkey-read.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: blocky-valkey-read
+  labels:
+    helm.sh/chart: valkey-0.9.3
+    app.kubernetes.io/name: valkey
+    app.kubernetes.io/instance: blocky
+    app.kubernetes.io/version: "9.0.3"
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: read
+spec:
+  type: ClusterIP
+  ports:
+    - name: tcp
+      port: 6379
+      targetPort: tcp
+      protocol: TCP
+  selector:
+    app.kubernetes.io/name: valkey
+    app.kubernetes.io/instance: blocky
--- a/clusters/cl01tl/manifests/blocky/Service-blocky-valkey.yaml
+++ b/clusters/cl01tl/manifests/blocky/Service-blocky-valkey.yaml
@@ -19,3 +19,4 @@ spec:
  selector:
    app.kubernetes.io/name: valkey
    app.kubernetes.io/instance: blocky
+    statefulset.kubernetes.io/pod-name: blocky-valkey-0
--- a/clusters/cl01tl/manifests/blocky/StatefulSet-blocky-valkey.yaml
+++ b/clusters/cl01tl/manifests/blocky/StatefulSet-blocky-valkey.yaml
@@ -1,5 +1,5 @@
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
  name: blocky-valkey
  labels:
@@ -9,20 +9,30 @@ metadata:
    app.kubernetes.io/version: "9.0.3"
    app.kubernetes.io/managed-by: Helm
 spec:
-  replicas: 1
-  strategy:
-    type: RollingUpdate
+  serviceName: blocky-valkey-headless
+  replicas: 3
+  podManagementPolicy: OrderedReady
  selector:
    matchLabels:
      app.kubernetes.io/name: valkey
      app.kubernetes.io/instance: blocky
+  volumeClaimTemplates:
+    - metadata:
+        name: valkey-data
+      spec:
+        accessModes:
+          - ReadWriteOnce
+        storageClassName: "ceph-block"
+        resources:
+          requests:
+            storage: "1Gi"
  template:
    metadata:
      labels:
        app.kubernetes.io/name: valkey
        app.kubernetes.io/instance: blocky
      annotations:
-        checksum/initconfig: 2d752b6b5c2e159b0111a667752e1fca
+        checksum/initconfig: "b997c0967aeeee370412add1d41691a1"
    spec:
      automountServiceAccountToken: false
      serviceAccountName: blocky-valkey
@@ -42,6 +52,11 @@ spec:
            runAsNonRoot: true
            runAsUser: 1000
          command: ["/scripts/init.sh"]
+          env:
+            - name: POD_INDEX
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.labels['apps.kubernetes.io/pod-index']
          volumeMounts:
            - name: valkey-data
              mountPath: /data
@@ -61,6 +76,10 @@ spec:
            runAsNonRoot: true
            runAsUser: 1000
          env:
+            - name: POD_INDEX
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.labels['apps.kubernetes.io/pod-index']
            - name: VALKEY_LOGLEVEL
              value: "notice"
          ports:
@@ -108,6 +127,3 @@ spec:
          configMap:
            name: blocky-valkey-init-scripts
            defaultMode: 0555
-        - name: valkey-data
-          persistentVolumeClaim:
-            claimName: blocky-valkey
--- a/clusters/cl01tl/manifests/grafana-operator/GrafanaDashboard-grafana-dashboard-redis-operator.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/GrafanaDashboard-grafana-dashboard-redis-operator.yaml
@@ -1,17 +0,0 @@
-apiVersion: grafana.integreatly.org/v1beta1
-kind: GrafanaDashboard
-metadata:
-  name: grafana-dashboard-redis-operator
-  namespace: grafana-operator
-  labels:
-    app.kubernetes.io/name: grafana-dashboard-redis-operator
-    app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/part-of: grafana-operator
-spec:
-  instanceSelector:
-    matchLabels:
-      app: grafana-main
-  contentCacheDuration: 1h
-  folderUID: grafana-folder-service
-  resyncPeriod: 1h
-  url: http://gitea-http.gitea:3000/alexlebens/grafana-dashboards/raw/branch/main/dashboards/service/redis-operator.json
--- a/clusters/cl01tl/manifests/grafana-operator/GrafanaDashboard-grafana-dashboard-redis-replication.yaml
+++ b/clusters/cl01tl/manifests/grafana-operator/GrafanaDashboard-grafana-dashboard-redis-replication.yaml
@@ -1,17 +0,0 @@
-apiVersion: grafana.integreatly.org/v1beta1
-kind: GrafanaDashboard
-metadata:
-  name: grafana-dashboard-redis-replication
-  namespace: grafana-operator
-  labels:
-    app.kubernetes.io/name: grafana-dashboard-redis-replication
-    app.kubernetes.io/instance: grafana-operator
-    app.kubernetes.io/part-of: grafana-operator
-spec:
-  instanceSelector:
-    matchLabels:
-      app: grafana-main
-  contentCacheDuration: 1h
-  folderUID: grafana-folder-service
-  resyncPeriod: 1h
-  url: http://gitea-http.gitea:3000/alexlebens/grafana-dashboards/raw/branch/main/dashboards/service/redis-replication.json
--- a/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml
+++ b/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml
@@ -61,6 +61,20 @@ data:
    html {
        font-size: 18px;
    }
+    ul#myTab {
+        background-color: rgba(240, 230, 215, 0.12) !important;
+        color: white !important;
+    }
+    li.service div.service-card,
+    li.bookmark a.rounded-md {
+        color: white !important;
+        background-color: rgba(240, 230, 215, 0.12) !important;
+        transition: all 150ms ease !important;
+    }
+    li.service div.service-card:hover,
+    li.bookmark a.rounded-md:hover {
+        background-color: rgba(240, 230, 215, 0.18) !important;
+    }
  docker.yaml: ""
  kubernetes.yaml: |
    mode: cluster
--- a/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml
+++ b/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml
@@ -24,7 +24,7 @@ spec:
  template:
    metadata:
      annotations:
-        checksum/configMaps: 3db8a419e6560546f697d19063ab7808365cbe7cf09d46f7ec7a2e56cbb32768
+        checksum/configMaps: 5c637e0850c43e318deda60c6550c6fd4e2fc408a4bf0e0734f2f4bf1c67b021
        checksum/secrets: d3ba83f111cd32f92c909268c55ad8bbd4f9e299b74b35b33c1a011180d8b378
      labels:
        app.kubernetes.io/controller: main
--- a/clusters/cl01tl/manifests/redis-operator/ClusterRole-redis-operator.yaml
+++ b/clusters/cl01tl/manifests/redis-operator/ClusterRole-redis-operator.yaml
@@ -1,125 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: redis-operator
-  labels:
-    app.kubernetes.io/name: redis-operator
-    helm.sh/chart: redis-operator-0.23.0
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/instance: redis-operator
-    app.kubernetes.io/version: 0.23.0
-    app.kubernetes.io/component: role
-    app.kubernetes.io/part-of: redis-operator
-rules:
-  - apiGroups:
-      - redis.redis.opstreelabs.in
-    resources:
-      - rediss
-      - redisclusters
-      - redisreplications
-      - redis
-      - rediscluster
-      - redissentinel
-      - redissentinels
-      - redisreplication
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - nonResourceURLs:
-      - '*'
-    verbs:
-      - get
-  - apiGroups:
-      - "apiextensions.k8s.io"
-    resources:
-      - "customresourcedefinitions"
-    verbs:
-      - "get"
-      - "list"
-      - "watch"
-  - apiGroups:
-      - redis.redis.opstreelabs.in
-    resources:
-      - redis/finalizers
-      - rediscluster/finalizers
-      - redisclusters/finalizers
-      - redissentinel/finalizers
-      - redissentinels/finalizers
-      - redisreplication/finalizers
-      - redisreplications/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - redis.redis.opstreelabs.in
-    resources:
-      - redis/status
-      - rediscluster/status
-      - redisclusters/status
-      - redissentinel/status
-      - redissentinels/status
-      - redisreplication/status
-      - redisreplications/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - ""
-    resources:
-      - secrets
-      - pods/exec
-      - pods
-      - services
-      - configmaps
-      - events
-      - persistentvolumeclaims
-      - namespace
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - apps
-    resources:
-      - statefulsets
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - "coordination.k8s.io"
-    resources:
-      - leases
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - "policy"
-    resources:
-      - poddisruptionbudgets
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
--- a/clusters/cl01tl/manifests/redis-operator/ClusterRoleBinding-redis-operator.yaml
+++ b/clusters/cl01tl/manifests/redis-operator/ClusterRoleBinding-redis-operator.yaml
@@ -1,20 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: redis-operator
-  labels:
-    app.kubernetes.io/name: redis-operator
-    helm.sh/chart: redis-operator-0.23.0
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/instance: redis-operator
-    app.kubernetes.io/version: 0.23.0
-    app.kubernetes.io/component: role-binding
-    app.kubernetes.io/part-of: redis-operator
-subjects:
-  - kind: ServiceAccount
-    name: redis-operator
-    namespace: redis-operator
-roleRef:
-  kind: ClusterRole
-  name: redis-operator
-  apiGroup: rbac.authorization.k8s.io
--- a/clusters/cl01tl/manifests/redis-operator/CustomResourceDefinition-redis.redis.redis.opstreelabs.in.yaml
+++ b/clusters/cl01tl/manifests/redis-operator/CustomResourceDefinition-redis.redis.redis.opstreelabs.in.yaml
--- a/clusters/cl01tl/manifests/redis-operator/CustomResourceDefinition-redisclusters.redis.redis.opstreelabs.in.yaml
+++ b/clusters/cl01tl/manifests/redis-operator/CustomResourceDefinition-redisclusters.redis.redis.opstreelabs.in.yaml
--- a/clusters/cl01tl/manifests/redis-operator/CustomResourceDefinition-redisreplications.redis.redis.opstreelabs.in.yaml
+++ b/clusters/cl01tl/manifests/redis-operator/CustomResourceDefinition-redisreplications.redis.redis.opstreelabs.in.yaml
--- a/clusters/cl01tl/manifests/redis-operator/CustomResourceDefinition-redissentinels.redis.redis.opstreelabs.in.yaml
+++ b/clusters/cl01tl/manifests/redis-operator/CustomResourceDefinition-redissentinels.redis.redis.opstreelabs.in.yaml
--- a/clusters/cl01tl/manifests/redis-operator/Deployment-redis-operator.yaml
+++ b/clusters/cl01tl/manifests/redis-operator/Deployment-redis-operator.yaml
@@ -1,76 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: redis-operator
-  namespace: redis-operator
-  labels:
-    app.kubernetes.io/name: redis-operator
-    helm.sh/chart: redis-operator-0.23.0
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/instance: redis-operator
-    app.kubernetes.io/version: 0.23.0
-    app.kubernetes.io/component: operator
-    app.kubernetes.io/part-of: redis-operator
-spec:
-  strategy:
-    rollingUpdate:
-      maxSurge: 50%
-      maxUnavailable: 50%
-    type: RollingUpdate
-  replicas: 2
-  selector:
-    matchLabels:
-      name: redis-operator
-  template:
-    metadata:
-      annotations:
-        cert-manager.io/inject-ca-from: redis-operator/serving-cert
-      labels:
-        name: redis-operator
-    spec:
-      automountServiceAccountToken: true
-      securityContext: {}
-      containers:
-        - name: "redis-operator"
-          securityContext: {}
-          image: "ghcr.io/ot-container-kit/redis-operator/redis-operator:v0.23.0"
-          imagePullPolicy: Always
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: probe
-          readinessProbe:
-            httpGet:
-              path: /readyz
-              port: probe
-          command:
-            - /operator
-            - manager
-          args:
-            - --leader-elect
-            - --metrics-bind-address=:8080
-          ports:
-            - containerPort: 8081
-              name: probe
-              protocol: TCP
-            - containerPort: 8080
-              name: metrics
-              protocol: TCP
-          env:
-            - name: INIT_CONTAINER_IMAGE
-              value: ghcr.io/ot-container-kit/redis-operator/redis-operator:v0.23.0
-            - name: ENABLE_WEBHOOKS
-              value: "false"
-            - name: SERVICE_DNS_DOMAIN
-              value: "cluster.local"
-            - name: FEATURE_GATES
-              value: "GenerateConfigInInitContainer=false"
-          resources:
-            limits:
-              cpu: 500m
-              memory: 500Mi
-            requests:
-              cpu: 50m
-              memory: 128Mi
-      serviceAccountName: "redis-operator"
-      serviceAccount: "redis-operator"
--- a/clusters/cl01tl/manifests/redis-operator/ServiceAccount-redis-operator.yaml
+++ b/clusters/cl01tl/manifests/redis-operator/ServiceAccount-redis-operator.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-automountServiceAccountToken: true
-metadata:
-  name: redis-operator
-  namespace: redis-operator
-  labels:
-    app.kubernetes.io/name: redis-operator
-    helm.sh/chart: redis-operator-0.23.0
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/instance: redis-operator
-    app.kubernetes.io/version: 0.23.0
-    app.kubernetes.io/component: service-account
-    app.kubernetes.io/part-of: redis-operator