diff --git a/.cspell/custom-dictionary-workspace.txt b/.cspell/custom-dictionary-workspace.txt index 47a5857..f9fb0df 100644 --- a/.cspell/custom-dictionary-workspace.txt +++ b/.cspell/custom-dictionary-workspace.txt @@ -11,6 +11,7 @@ glddns gomplate IMMICH Jellyfin +keepalives KUBECONFIG kubernetescrd letsencrypt @@ -25,6 +26,7 @@ OVERWRITEHOST OVERWRITEPROTOCOL OVERWRITEWEBROOT PGDATA +pgvector rcode SAMEORIGIN traefik diff --git a/apps/redis/config/example.env b/apps/redis/config/example.env deleted file mode 100644 index e69de29..0000000 diff --git a/apps/redis/deployment.yaml b/apps/redis/deployment.yaml index fc58926..43bda53 100644 --- a/apps/redis/deployment.yaml +++ b/apps/redis/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: redis + name: redis-deployment spec: selector: matchLabels: @@ -14,17 +14,11 @@ spec: app: redis spec: containers: - - image: redis:alpine + - image: "{{ .config.apps.redis.image }}" name: redis ports: - - containerPort: 6379 + - containerPort: {{ .config.apps.redis.port }} env: - name: TZ - valueFrom: - configMapKeyRef: - name: config - key: TZ - envFrom: - - configMapRef: - name: config + value: "{{ .config.apps.redis.timezone }}" restartPolicy: Always diff --git a/apps/redis/kustomization.yaml b/apps/redis/kustomization.yaml index e314f0c..df0071a 100644 --- a/apps/redis/kustomization.yaml +++ b/apps/redis/kustomization.yaml @@ -11,11 +11,3 @@ resources: - deployment.yaml - namespace.yaml - service.yaml -configMapGenerator: - - name: config - envs: - - config/config.env -secretGenerator: - - name: secrets - envs: - - config/secrets.env diff --git a/apps/redis/manifest.yaml b/apps/redis/manifest.yaml index f9764b0..a908107 100644 --- a/apps/redis/manifest.yaml +++ b/apps/redis/manifest.yaml @@ -3,3 +3,7 @@ install: true description: Redis is an open source, in-memory data structure store, used as a database, cache and message broker. version: 1.0.0 icon: +defaultConfig: + image: redis:alpine + timezone: UTC + port: 6379 diff --git a/apps/redis/service.yaml b/apps/redis/service.yaml index 6e0a7ee..f0c5e43 100644 --- a/apps/redis/service.yaml +++ b/apps/redis/service.yaml @@ -2,11 +2,12 @@ apiVersion: v1 kind: Service metadata: - name: redis + name: redis-service labels: app: redis spec: ports: - - port: 6379 + - port: {{ .config.apps.redis.port }} + targetPort: {{ .config.apps.redis.port }} selector: app: redis