diff --git a/helmfile.d/dragonfly.yaml.gotmpl b/helmfile.d/dragonfly.yaml.gotmpl new file mode 100644 index 00000000..317676de --- /dev/null +++ b/helmfile.d/dragonfly.yaml.gotmpl @@ -0,0 +1,44 @@ +bases: + - ../envs/environments.yaml.gotmpl + +repositories: +- name: dragonfly + oci: true + url: ghcr.io/dragonflydb/dragonfly-operator/helm + +commonLabels: + tier: system + +releases: +- name: dragonfly + namespace: dragonfly + chart: dragonfly/dragonfly-operator + version: v1.3.0 + condition: dragonfly.enabled + values: + - ../values/dragonfly/values/dragonfly.yaml.gotmpl + - ../values/dragonfly/values/dragonfly-{{ .Environment.Name }}.yaml.gotmpl + postRenderer: ../bin/kustomizer + postRendererArgs: + - ../values/dragonfly/kustomize/{{ .Environment.Name }} + missingFileHandler: Info +- name: manifests + namespace: dragonfly + chart: manifests + condition: dragonfly.enabled + missingFileHandler: Info + values: + - ../values/env.yaml + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/dragonfly/env.yaml.gotmpl + - ../values/dragonfly/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl + hooks: + - events: [ prepare, cleanup ] + showlogs: true + command: ../bin/helmify + args: + - '{{`{{ if eq .Event.Name "prepare" }}build{{ else }}clean{{ end }}`}}' + - '{{`{{ .Release.Chart }}`}}' + - '{{`{{ .Environment.Name }}`}}' + - ../values/dragonfly/manifests + - manifests diff --git a/helmfile.d/redis-operator.yaml.gotmpl b/helmfile.d/redis-operator.yaml.gotmpl deleted file mode 100644 index 9650fba9..00000000 --- a/helmfile.d/redis-operator.yaml.gotmpl +++ /dev/null @@ -1,43 +0,0 @@ -bases: - - ../envs/environments.yaml.gotmpl - -repositories: -- name: redis-operator - url: 'https://ot-container-kit.github.io/helm-charts' - -commonLabels: - tier: system - -releases: -- name: redis-operator - namespace: redis-operator - chart: redis-operator/redis-operator - version: 0.22.1 - condition: redis_operator.enabled - values: - - ../values/redis-operator/values/redis-operator.yaml.gotmpl - - ../values/redis-operator/values/redis-operator-{{ .Environment.Name }}.yaml.gotmpl - postRenderer: ../bin/kustomizer - postRendererArgs: - - ../values/redis-operator/kustomize/{{ .Environment.Name }} - missingFileHandler: Info -- name: manifests - namespace: redis-operator - chart: manifests - condition: redis_operator.enabled - missingFileHandler: Info - values: - - ../values/env.yaml - - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml - - ../values/redis-operator/env.yaml.gotmpl - - ../values/redis-operator/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl - hooks: - - events: [ prepare, cleanup ] - showlogs: true - command: ../bin/helmify - args: - - '{{`{{ if eq .Event.Name "prepare" }}build{{ else }}clean{{ end }}`}}' - - '{{`{{ .Release.Chart }}`}}' - - '{{`{{ .Environment.Name }}`}}' - - ../values/redis-operator/manifests - - manifests diff --git a/values/redis-operator/env-ekman.yaml.gotmpl b/values/dragonfly/env-ekman.yaml.gotmpl similarity index 68% rename from values/redis-operator/env-ekman.yaml.gotmpl rename to values/dragonfly/env-ekman.yaml.gotmpl index f87f0124..c5b125d9 100644 --- a/values/redis-operator/env-ekman.yaml.gotmpl +++ b/values/dragonfly/env-ekman.yaml.gotmpl @@ -1,3 +1,3 @@ -redis_operator: +dragonfly: enabled: true autosync: false diff --git a/values/redis-operator/env-oceanbox.yaml.gotmpl b/values/dragonfly/env-oceanbox.yaml.gotmpl similarity index 68% rename from values/redis-operator/env-oceanbox.yaml.gotmpl rename to values/dragonfly/env-oceanbox.yaml.gotmpl index f87f0124..c5b125d9 100644 --- a/values/redis-operator/env-oceanbox.yaml.gotmpl +++ b/values/dragonfly/env-oceanbox.yaml.gotmpl @@ -1,3 +1,3 @@ -redis_operator: +dragonfly: enabled: true autosync: false diff --git a/values/redis-operator/env.yaml.gotmpl b/values/dragonfly/env.yaml.gotmpl similarity index 68% rename from values/redis-operator/env.yaml.gotmpl rename to values/dragonfly/env.yaml.gotmpl index 5d7833c9..59c1b6ed 100644 --- a/values/redis-operator/env.yaml.gotmpl +++ b/values/dragonfly/env.yaml.gotmpl @@ -1,3 +1,3 @@ -redis_operator: +dragonfly: enabled: false autosync: false diff --git a/values/redis-operator/manifests/redis-operator.yaml b/values/dragonfly/manifests/dragonfly.yaml similarity index 85% rename from values/redis-operator/manifests/redis-operator.yaml rename to values/dragonfly/manifests/dragonfly.yaml index 66126931..262f5c24 100644 --- a/values/redis-operator/manifests/redis-operator.yaml +++ b/values/dragonfly/manifests/dragonfly.yaml @@ -2,11 +2,11 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: redis-operator + name: dragonfly namespace: argocd spec: destination: - namespace: redis-operator + namespace: dragonfly server: 'https://kubernetes.default.svc' sources: - repoURL: {{ .Values.clusterConfig.manifests }} @@ -20,7 +20,7 @@ spec: - name: HELMFILE_ENVIRONMENT value: default - name: HELMFILE_FILE_PATH - value: redis-operator.yaml.gotmpl + value: dragonfly.yaml.gotmpl project: sys syncPolicy: managedNamespaceMetadata: @@ -30,7 +30,7 @@ spec: - CreateNamespace=true - ApplyOutOfSyncOnly=true - ServerSideApply=true - {{- if .Values.redis_operator.autosync }} + {{- if .Values.dragonfly}} automated: prune: true # selfHeal: false diff --git a/values/redis-operator/manifests/policies/CiliumNetworkPolicy-allow-api-server.yaml b/values/dragonfly/manifests/policies/CiliumNetworkPolicy-allow-api-server.yaml similarity index 75% rename from values/redis-operator/manifests/policies/CiliumNetworkPolicy-allow-api-server.yaml rename to values/dragonfly/manifests/policies/CiliumNetworkPolicy-allow-api-server.yaml index c2180393..f60658ce 100644 --- a/values/redis-operator/manifests/policies/CiliumNetworkPolicy-allow-api-server.yaml +++ b/values/dragonfly/manifests/policies/CiliumNetworkPolicy-allow-api-server.yaml @@ -3,12 +3,12 @@ apiVersion: cilium.io/v2 kind: CiliumNetworkPolicy metadata: name: allow-api-server - namespace: redis-operator + namespace: dragonfly spec: egress: - toEntities: - kube-apiserver endpointSelector: matchLabels: - app.kubernetes.io/instance: redis-operator + app.kubernetes.io/instance: dragonfly-operator {{- end}} diff --git a/values/redis-operator/manifests/policies/CiliumNetworkPolicy-allow-host-to-redis.yaml b/values/dragonfly/manifests/policies/CiliumNetworkPolicy-allow-host-to-dragonfly.yaml similarity index 65% rename from values/redis-operator/manifests/policies/CiliumNetworkPolicy-allow-host-to-redis.yaml rename to values/dragonfly/manifests/policies/CiliumNetworkPolicy-allow-host-to-dragonfly.yaml index a78637a1..8a75baf0 100644 --- a/values/redis-operator/manifests/policies/CiliumNetworkPolicy-allow-host-to-redis.yaml +++ b/values/dragonfly/manifests/policies/CiliumNetworkPolicy-allow-host-to-dragonfly.yaml @@ -2,12 +2,12 @@ apiVersion: cilium.io/v2 kind: CiliumNetworkPolicy metadata: - name: allow-host-to-redis - namespace: redis-operator + name: allow-host-to-dragonfly + namespace: dragonfly spec: endpointSelector: matchLabels: - app.kubernetes.io/instance: redis-operator + app.kubernetes.io/instance: dragonfly-operator ingress: - fromEntities: - host diff --git a/values/redis-operator/manifests/policies/CiliumNetworkPolicy-allow-prometheus-metrics.yaml b/values/dragonfly/manifests/policies/CiliumNetworkPolicy-allow-prometheus-metrics.yaml similarity index 83% rename from values/redis-operator/manifests/policies/CiliumNetworkPolicy-allow-prometheus-metrics.yaml rename to values/dragonfly/manifests/policies/CiliumNetworkPolicy-allow-prometheus-metrics.yaml index 1f83cc1a..6f48b913 100644 --- a/values/redis-operator/manifests/policies/CiliumNetworkPolicy-allow-prometheus-metrics.yaml +++ b/values/dragonfly/manifests/policies/CiliumNetworkPolicy-allow-prometheus-metrics.yaml @@ -3,11 +3,11 @@ apiVersion: cilium.io/v2 kind: CiliumNetworkPolicy metadata: name: allow-prometheus-metrics - namespace: redis-operator + namespace: dragonfly spec: endpointSelector: matchLabels: - app.kubernetes.io/instance: redis-operator + app.kubernetes.io/instance: dragonfly-operator ingress: - fromEndpoints: - matchLabels: diff --git a/values/redis-operator/manifests/policies/CiliumNetworkPolicy-allow-remote-node-webhooks.yaml b/values/dragonfly/manifests/policies/CiliumNetworkPolicy-allow-remote-node-webhooks.yaml similarity index 93% rename from values/redis-operator/manifests/policies/CiliumNetworkPolicy-allow-remote-node-webhooks.yaml rename to values/dragonfly/manifests/policies/CiliumNetworkPolicy-allow-remote-node-webhooks.yaml index 027d06a0..ce87f14c 100644 --- a/values/redis-operator/manifests/policies/CiliumNetworkPolicy-allow-remote-node-webhooks.yaml +++ b/values/dragonfly/manifests/policies/CiliumNetworkPolicy-allow-remote-node-webhooks.yaml @@ -3,7 +3,7 @@ apiVersion: cilium.io/v2 kind: CiliumNetworkPolicy metadata: name: allow-remote-node-webhooks - namespace: redis-operator + namespace: dragonfly spec: endpointSelector: matchLabels: {} diff --git a/values/dragonfly/values/dragonfly.yaml.gotmpl b/values/dragonfly/values/dragonfly.yaml.gotmpl new file mode 100644 index 00000000..f686c053 --- /dev/null +++ b/values/dragonfly/values/dragonfly.yaml.gotmpl @@ -0,0 +1,2 @@ +serviceMonitor: + enabled: true diff --git a/values/redis-operator/values/redis-operator.yaml.gotmpl b/values/redis-operator/values/redis-operator.yaml.gotmpl deleted file mode 100644 index 63bc90a6..00000000 --- a/values/redis-operator/values/redis-operator.yaml.gotmpl +++ /dev/null @@ -1,25 +0,0 @@ -certmanager: - enabled: true - -redisOperator: - webhook: true - -# issuer: - # create: true - # kind: ClusterIssuer - # name: - -# ha: -# enabled: false -# metrics: -# enabled: true -# serviceMonitor: -# additionalLabels: -# release: prometheus -# enabled: true -# webhook: -# certificate: -# certManager: false -# serviceMonitor: -# additionalLabels: -# release: prometehus