From ba63e97b2e3e38a77876a31bd782046cc16dba2d Mon Sep 17 00:00:00 2001 From: j Date: Thu, 10 Jul 2025 18:19:12 +1000 Subject: [PATCH] Move core operators to deployments due to chicken egg issues --- chart/templates/operators-mariadb.yaml | 55 ------------- chart/templates/operators-replicator.yaml | 98 ----------------------- deployments/kustomization.yaml | 2 + 3 files changed, 2 insertions(+), 153 deletions(-) delete mode 100644 chart/templates/operators-mariadb.yaml delete mode 100644 chart/templates/operators-replicator.yaml diff --git a/chart/templates/operators-mariadb.yaml b/chart/templates/operators-mariadb.yaml deleted file mode 100644 index 3edc1e1..0000000 --- a/chart/templates/operators-mariadb.yaml +++ /dev/null @@ -1,55 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: mariadb-operator - namespace: {{ .Release.Namespace }} -spec: - url: https://helm.mariadb.com/mariadb-operator - interval: 1h ---- -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: mariadb-operator-crds - namespace: {{ .Release.Namespace }} -spec: - interval: 30m - chart: - spec: - chart: mariadb-operator-crds - version: 0.38.1 - sourceRef: - kind: HelmRepository - name: mariadb-operator - namespace: {{ .Release.Namespace }} - install: - createNamespace: true - upgrade: - disableWait: true - timeout: 5m ---- -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: mariadb-operator - namespace: {{ .Release.Namespace }} -spec: - interval: 30m - chart: - spec: - chart: mariadb-operator - version: 0.38.1 - sourceRef: - kind: HelmRepository - name: mariadb-operator - namespace: {{ .Release.Namespace }} - install: - createNamespace: true - dependsOn: - - name: mariadb-operator-crds - namespace: {{ .Release.Namespace }} - values: - metrics: - enabled: true - diff --git a/chart/templates/operators-replicator.yaml b/chart/templates/operators-replicator.yaml deleted file mode 100644 index 52840a1..0000000 --- a/chart/templates/operators-replicator.yaml +++ /dev/null @@ -1,98 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: kubernetes-replicator - namespace: {{ .Release.Namespace }} ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: kubernetes-replicator -rules: - - apiGroups: ["", "apps", "extensions"] - resources: - - secrets - - configmaps - - roles - - rolebindings - - cronjobs - - deployments - - events - - ingresses - - jobs - - pods - - pods/attach - - pods/exec - - pods/log - - pods/portforward - - services - - namespaces - - serviceaccounts - verbs: ["*"] - - apiGroups: ["batch"] - resources: - - configmaps - - cronjobs - - deployments - - events - - ingresses - - jobs - - pods - - pods/attach - - pods/exec - - pods/log - - pods/portforward - - services - verbs: ["*"] - - apiGroups: ["rbac.authorization.k8s.io"] - resources: - - roles - - rolebindings - - clusterrolebindings - verbs: ["get", "list", "watch"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: kubernetes-replicator -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: kubernetes-replicator -subjects: - - kind: ServiceAccount - name: kubernetes-replicator - namespace: {{ .Release.Namespace }} ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: mittwald - namespace: {{ .Release.Namespace }} -spec: - url: https://helm.mittwald.de - interval: 1h ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: kubernetes-replicator - namespace: {{ .Release.Namespace }} -spec: - interval: 5m - chart: - spec: - chart: kubernetes-replicator - sourceRef: - kind: HelmRepository - name: mittwald - namespace: {{ .Release.Namespace }} - install: - createNamespace: false - upgrade: - disableWait: false - values: - serviceAccount: - create: false - name: kubernetes-replicator diff --git a/deployments/kustomization.yaml b/deployments/kustomization.yaml index 52b0300..9b9016c 100644 --- a/deployments/kustomization.yaml +++ b/deployments/kustomization.yaml @@ -4,4 +4,6 @@ kind: Kustomization resources: - manifests/00-namespaces.yaml - manifests/10-repo-prod.yaml + - manifests/20-hrel-mariadb.yaml + - manifests/20-hrel-replicator.yaml - manifests/30-hrel-prod.yaml