yyvf22 pushed to branch main at Root / Kubernetes / FluxCD Commits: db0b1014 by yyvf at 2025-08-04T14:57:55-03:00 refactor(fluxcd): infrastructure and monitoring - - - - - 41aaeda5 by yyvf22 at 2025-08-04T18:06:26+00:00 Merge branch 'refactor' into 'main' refactor(fluxcd): infrastructure and monitoring See merge request root/k8s/fluxcd!1 - - - - - 21 changed files: - infrastructure/base/controllers/ceph-csi.yaml → infrastructure/base/ceph-csi/helmrelease.yaml - + infrastructure/base/ceph-csi/helmrepo.yaml - infrastructure/base/controllers/kustomization.yaml → infrastructure/base/ceph-csi/kustomization.yaml - + infrastructure/base/ceph-csi/ns.yaml - infrastructure/base/configs/cluster-issuers.yaml → infrastructure/base/cert-manager/clusterissuer.yaml - infrastructure/base/controllers/cert-manager.yaml → infrastructure/base/cert-manager/helmrelease.yaml - + infrastructure/base/cert-manager/helmrepo.yaml - + infrastructure/base/cert-manager/kustomization.yaml - + infrastructure/base/cert-manager/ns.yaml - infrastructure/base/controllers/cilium.yaml → infrastructure/base/cilium/helmrelease.yaml - + infrastructure/base/cilium/helmrepo.yaml - infrastructure/base/configs/kustomization.yaml → infrastructure/base/cilium/kustomization.yaml - infrastructure/base/configs/l2announcement.yaml → infrastructure/base/cilium/l2announcement.yaml - infrastructure/prod/kustomization.yaml - infrastructure/stage/kustomization.yaml - monitoring/base/controllers/kube-prometheus-stack/es.yaml → monitoring/base/kube-prometheus-stack/es.yaml - monitoring/base/controllers/kube-prometheus-stack/helmrelease.yaml → monitoring/base/kube-prometheus-stack/helmrelease.yaml - monitoring/base/controllers/kube-prometheus-stack/helmrepo.yaml → monitoring/base/kube-prometheus-stack/helmrepo.yaml - monitoring/base/controllers/kube-prometheus-stack/kustomization.yaml → monitoring/base/kube-prometheus-stack/kustomization.yaml - monitoring/base/controllers/kube-prometheus-stack/ns.yaml → monitoring/base/kube-prometheus-stack/ns.yaml - monitoring/stage/kustomization.yaml Changes: ===================================== infrastructure/base/controllers/ceph-csi.yaml → infrastructure/base/ceph-csi/helmrelease.yaml ===================================== @@ -1,19 +1,3 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: ceph - labels: - pod-security.kubernetes.io/enforce: privileged ---- -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: ceph - namespace: ceph -spec: - interval: 1m0s - url: https://ceph.github.io/csi-charts ---- apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: ===================================== infrastructure/base/ceph-csi/helmrepo.yaml ===================================== @@ -0,0 +1,8 @@ +apiVersion: source.toolkit.fluxcd.io/v1 +kind: HelmRepository +metadata: + name: ceph + namespace: ceph +spec: + interval: 1m0s + url: https://ceph.github.io/csi-charts ===================================== infrastructure/base/controllers/kustomization.yaml → infrastructure/base/ceph-csi/kustomization.yaml ===================================== @@ -1,6 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - cert-manager.yaml - - cilium.yaml - - ceph-csi.yaml + - ns.yaml + - helmrepo.yaml + - helmrelease.yaml ===================================== infrastructure/base/ceph-csi/ns.yaml ===================================== @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: ceph + labels: + pod-security.kubernetes.io/enforce: privileged ===================================== infrastructure/base/configs/cluster-issuers.yaml → infrastructure/base/cert-manager/clusterissuer.yaml ===================================== @@ -1,25 +1,5 @@ apiVersion: cert-manager.io/v1 kind: ClusterIssuer -metadata: - name: letsencrypt -spec: - acme: - # The ACME server URL. - # This is replaced by /clusters/prod/infrastructure.yaml. - server: https://acme-v02.api.letsencrypt.org/directory - # Email address used for ACME registration - email: root@inf.ufpr.br - # Name of a secret used to store the ACME account private key - privateKeySecretRef: - name: letsencrypt - # Enable the HTTP-01 challenge provider - solvers: - - http01: - ingress: - ingressClassName: nginx ---- -apiVersion: cert-manager.io/v1 -kind: ClusterIssuer metadata: name: letsencrypt-wildcard spec: ===================================== infrastructure/base/controllers/cert-manager.yaml → infrastructure/base/cert-manager/helmrelease.yaml ===================================== @@ -1,17 +1,3 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: cert-manager ---- -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: cert-manager - namespace: cert-manager -spec: - interval: 1m0s - url: https://charts.jetstack.io ---- apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: ===================================== infrastructure/base/cert-manager/helmrepo.yaml ===================================== @@ -0,0 +1,8 @@ +apiVersion: source.toolkit.fluxcd.io/v1 +kind: HelmRepository +metadata: + name: cert-manager + namespace: cert-manager +spec: + interval: 1m0s + url: https://charts.jetstack.io ===================================== infrastructure/base/cert-manager/kustomization.yaml ===================================== @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ns.yaml + - helmrepo.yaml + - helmrelease.yaml + - clusterissuer.yaml ===================================== infrastructure/base/cert-manager/ns.yaml ===================================== @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: cert-manager ===================================== infrastructure/base/controllers/cilium.yaml → infrastructure/base/cilium/helmrelease.yaml ===================================== @@ -1,12 +1,3 @@ -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: cilium - namespace: kube-system -spec: - interval: 1h - url: https://helm.cilium.io/ ---- apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: ===================================== infrastructure/base/cilium/helmrepo.yaml ===================================== @@ -0,0 +1,8 @@ +apiVersion: source.toolkit.fluxcd.io/v1 +kind: HelmRepository +metadata: + name: cilium + namespace: kube-system +spec: + interval: 1h + url: https://helm.cilium.io/ ===================================== infrastructure/base/configs/kustomization.yaml → infrastructure/base/cilium/kustomization.yaml ===================================== @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - cluster-issuers.yaml + - helmrepo.yaml + - helmrelease.yaml - l2announcement.yaml ===================================== infrastructure/base/configs/l2announcement.yaml → infrastructure/base/cilium/l2announcement.yaml ===================================== ===================================== infrastructure/prod/kustomization.yaml ===================================== @@ -1,6 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../base/controllers - - ../base/configs + - ../base/cilium + - ../base/ceph-csi + - ../base/cert-manager - ./ippool.yaml ===================================== infrastructure/stage/kustomization.yaml ===================================== @@ -1,6 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../base/controllers - - ../base/configs + - ../base/cilium + - ../base/ceph-csi + - ../base/cert-manager - ./ippool.yaml ===================================== monitoring/base/controllers/kube-prometheus-stack/es.yaml → monitoring/base/kube-prometheus-stack/es.yaml ===================================== ===================================== monitoring/base/controllers/kube-prometheus-stack/helmrelease.yaml → monitoring/base/kube-prometheus-stack/helmrelease.yaml ===================================== ===================================== monitoring/base/controllers/kube-prometheus-stack/helmrepo.yaml → monitoring/base/kube-prometheus-stack/helmrepo.yaml ===================================== ===================================== monitoring/base/controllers/kube-prometheus-stack/kustomization.yaml → monitoring/base/kube-prometheus-stack/kustomization.yaml ===================================== ===================================== monitoring/base/controllers/kube-prometheus-stack/ns.yaml → monitoring/base/kube-prometheus-stack/ns.yaml ===================================== ===================================== monitoring/stage/kustomization.yaml ===================================== @@ -1,4 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../base/controllers/kube-prometheus-stack + - ../base/kube-prometheus-stack View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/compare/1812b554e5a230ce5d4e57... -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/compare/1812b554e5a230ce5d4e57... You're receiving this email because of your account on gitlab.c3sl.ufpr.br.