Merge pull request 'develop' (#2) from develop into main

Reviewed-on: #2

components/node/replacements/service.yaml

@@ -7,9 +7,11 @@
       kind: Service
       name: valkey-headless
     fieldPaths:
+    - metadata.labels.app
     - spec.selector.app
   - select:
       kind: Service
       name: valkey
     fieldPaths:
+    - metadata.labels.app
     - spec.selector.app

components/node/replacements/statefulset.yaml

@@ -1,13 +1,3 @@
-- source:
-    kind: ConfigMap
-    name: valkey-env
-    fieldPath: data.VALKEY_REPLICAS
-  targets:
-  - select:
-      kind: StatefulSet
-      name: valkey-node
-    fieldPaths:
-    - spec.replicas
 - source:
     kind: ConfigMap
     name: valkey-env

misc/tests/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- resources/namespace.yaml
+- resources/vlone
+- resources/vltwo

misc/tests/resources/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: vltest

misc/tests/resources/vlone/kustomization.yaml

@@ -0,0 +1,25 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namePrefix: vlone-
+
+components:
+- https://forge.cadoles.com/CadolesKube/valkey-kustom//components/node
+
+configMapGenerator:
+- name: valkey-env
+  literals:
+  - NAMESPACE="vltest"
+  - VALKEY_ENV="vltest"
+  - VALKEY_NAME="vlone-valkey-node"
+  - VALKEY_SERVICE="vlone-valkey"
+  - VALKEY_HEADLESS_SERVICE="vlone-valkey-headless"
+  - VALKEY_MASTER_NAME="mymaster"
+  - VALKEY_REPLICAS="6"
+  - VALKEY_PORT="6379"
+  - VALKEY_SENTINEL_PORT="26379"
+  - ALLOW_EMPTY_PASSWORD="yes"
+  - VALKEY_TLS_ENABLED="no"
+  - VALKEY_SENTINEL_TLS_ENABLED="no"
+  - VALKEY_DATA_DIR="/data"
+  - VALKEY_LOG_LEVEL="warning"
+  - VALKEY_QUORUM="2"

misc/tests/resources/vlone/replacements/services.yaml

@@ -0,0 +1,20 @@
+- source:
+    kind: ConfigMap
+    name: vlone
+    fieldPath: data.VALKEY_HEADLESS_SERVICE
+  targets:
+  - select:
+      kind: Service
+      name: valkey-headless
+    fieldPaths:
+    - metadata.name
+- source:
+    kind: ConfigMap
+    name: vlone
+    fieldPath: data.VALKEY_SERVICE
+  targets:
+  - select:
+      kind: Service
+      name: valkey
+    fieldPaths:
+    - metadata.name

misc/tests/resources/vlone/replacements/statefulset.yaml

@@ -0,0 +1,31 @@
+- source:
+    kind: ConfigMap
+    name: vlone
+    fieldPath: data.VALKEY_NAME
+  targets:
+  - select:
+      kind: StatefulSet
+      name: valkey-node
+    fieldPaths:
+    - metadata.name
+- source:
+    kind: ConfigMap
+    name: vlone
+    fieldPath: data.VALKEY_ENV_NAME
+  targets:
+  - select:
+      kind: StatefulSet
+      name: valkey-node
+      fieldPaths:
+      - spec.template.spec.containers[*].envFrom[0].configMapRef.name
+      - spec.template.spec.initContainers[*].envFrom[0].configMapRef.name
+- source:
+    kind: ConfigMap
+    name: vlone
+    fieldPath: data.VALKEY_CONF_NAME
+  targets:
+  - select:
+      kind: StatefulSet
+      name: valkey-node
+      fieldPaths:
+      - spec.template.spec.initContainers[*].volumeMounts[valkey-config].name

misc/tests/resources/vltwo/kustomization.yaml

@@ -0,0 +1,25 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namePrefix: vltwo-
+
+components:
+- https://forge.cadoles.com/CadolesKube/valkey-kustom//components/node
+
+configMapGenerator:
+- name: valkey-env
+  literals:
+  - NAMESPACE="vltest"
+  - VALKEY_ENV="vltest"
+  - VALKEY_NAME="vltwo-valkey-node"
+  - VALKEY_SERVICE="vltwo-valkey"
+  - VALKEY_HEADLESS_SERVICE="vltwo-valkey-headless"
+  - VALKEY_MASTER_NAME="vltwomaster"
+  - VALKEY_REPLICAS="4"
+  - VALKEY_PORT="6379"
+  - VALKEY_SENTINEL_PORT="26379"
+  - ALLOW_EMPTY_PASSWORD="yes"
+  - VALKEY_TLS_ENABLED="no"
+  - VALKEY_SENTINEL_TLS_ENABLED="no"
+  - VALKEY_DATA_DIR="/data"
+  - VALKEY_LOG_LEVEL="warning"
+  - VALKEY_QUORUM="2"

misc/tests/resources/vltwo/replacements/services.yaml

@@ -0,0 +1,20 @@
+- source:
+    kind: ConfigMap
+    name: vltwo
+    fieldPath: data.VALKEY_HEADLESS_SERVICE
+  targets:
+  - select:
+      kind: Service
+      name: valkey-headless
+    fieldPaths:
+    - metadata.name
+- source:
+    kind: ConfigMap
+    name: vltwo
+    fieldPath: data.VALKEY_SERVICE
+  targets:
+  - select:
+      kind: Service
+      name: valkey
+    fieldPaths:
+    - metadata.name

misc/tests/resources/vltwo/replacements/statefulset.yaml

@@ -0,0 +1,31 @@
+- source:
+    kind: ConfigMap
+    name: vltwo
+    fieldPath: data.VALKEY_NAME
+  targets:
+  - select:
+      kind: StatefulSet
+      name: valkey-node
+    fieldPaths:
+    - metadata.name
+- source:
+    kind: ConfigMap
+    name: vltwo
+    fieldPath: data.VALKEY_ENV_NAME
+  targets:
+  - select:
+      kind: StatefulSet
+      name: valkey-node
+      fieldPaths:
+      - spec.template.spec.containers[*].envFrom[0].configMapRef.name
+      - spec.template.spec.initContainers[*].envFrom[0].configMapRef.name
+- source:
+    kind: ConfigMap
+    name: vltwo
+    fieldPath: data.VALKEY_CONF_NAME
+  targets:
+  - select:
+      kind: StatefulSet
+      name: valkey-node
+      fieldPaths:
+      - spec.template.spec.initContainers[*].volumeMounts[valkey-config].name