Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: big time operator #8534

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .taskfiles/bootstrap/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ tasks:
- kubectl apply --server-side --kustomize {{.CLUSTER_DIR}}/bootstrap/apps
- for: { var: TEMPLATES }
cmd: op run --env-file {{.CLUSTER_DIR}}/bootstrap/bootstrap.env --no-masking -- minijinja-cli {{.ITEM}} | kubectl apply --server-side --filename -
- kubectl apply --server-side --kustomize {{.CLUSTER_DIR}}/flux/instance
- until kubectl wait fluxinstance --for=condition=Ready --timeout=10m --all --all-namespaces &>/dev/null; do sleep 5; done
- kubectl apply --server-side --kustomize {{.CLUSTER_DIR}}/flux/config
vars:
TEMPLATES:
Expand Down

This file was deleted.

This file was deleted.

22 changes: 0 additions & 22 deletions kubernetes/main/apps/flux-system/addons/ks.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
serviceMonitor:
create: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: flux-operator
spec:
interval: 30m
chart:
spec:
chart: flux-operator
version: 0.12.0
sourceRef:
kind: HelmRepository
name: controlplaneio
namespace: flux-system
install:
remediation:
retries: 3
upgrade:
cleanupOnFail: true
remediation:
strategy: rollback
retries: 3
valuesFrom:
- kind: ConfigMap
name: flux-operator-helm-values
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./helmrelease.yaml
configMapGenerator:
- name: flux-operator-helm-values
files:
- values.yaml=./helm-values.yaml
configurations:
- kustomizeconfig.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
nameReference:
- kind: ConfigMap
version: v1
fieldSpecs:
- path: spec/valuesFrom/name
kind: HelmRelease
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./monitoring
- ./notifications
- ./webhooks
42 changes: 42 additions & 0 deletions kubernetes/main/apps/flux-system/flux-operator/ks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: &app flux-operator
namespace: flux-system
spec:
targetNamespace: flux-system
commonMetadata:
labels:
app.kubernetes.io/name: *app
path: ./kubernetes/main/apps/flux-system/flux-operator/app
prune: true
sourceRef:
kind: GitRepository
name: home-kubernetes
wait: true
interval: 30m
timeout: 5m
---
# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: &app flux-config
namespace: flux-system
spec:
targetNamespace: flux-system
commonMetadata:
labels:
app.kubernetes.io/name: *app
dependsOn:
- name: flux-operator
path: ./kubernetes/main/apps/flux-system/flux-operator/config
prune: true
sourceRef:
kind: GitRepository
name: home-kubernetes
wait: false
interval: 30m
timeout: 5m
2 changes: 1 addition & 1 deletion kubernetes/main/apps/flux-system/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ resources:
# Pre Flux-Kustomizations
- ./namespace.yaml
# Flux-Kustomizations
- ./addons/ks.yaml
- ./flux-operator/ks.yaml
7 changes: 7 additions & 0 deletions kubernetes/main/bootstrap/apps/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,10 @@ releases:
version: v0.0.28
values: ["../../apps/kube-system/spegel/app/helm-values.yaml"]
needs: ["kube-system/kubelet-csr-approver"]

- name: flux-operator
namespace: flux-system
chart: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator
version: 0.12.0
values: ["../../apps/flux-system/flux-operator/app/helm-values.yaml"]
needs: ["kube-system/spegel"]
121 changes: 0 additions & 121 deletions kubernetes/main/flux/config/flux.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions kubernetes/main/flux/config/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
# yaml-language-server: $schema=https://json.schemastore.org/kustomization
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: flux-system
resources:
- ./cluster.yaml
- ./flux.yaml
Loading
Loading