From 43edb223d34e6acce94e4f6e65fedb5cb4029c58 Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 28 Dec 2022 15:59:15 +0100 Subject: [PATCH] cleanup flux --- .../apps/gitops/drone/external-secret.yaml | 27 ----- .../apps/gitops/drone/kustomization.yaml | 6 -- flux/cluster/apps/gitops/drone/runner.yaml | 30 ------ flux/cluster/apps/gitops/drone/server.yaml | 37 ------- flux/cluster/apps/gitops/kustomization.yaml | 1 - flux/cluster/apps/kustomization.yaml | 1 - .../monitoring/goldilocks/helm-release.yaml | 22 ----- .../monitoring/goldilocks/kustomization.yaml | 4 - .../apps/monitoring/kustomization.yaml | 6 -- .../apps/monitoring/polaris/helm-release.yaml | 21 ---- .../monitoring/polaris/kustomization.yaml | 4 - .../apps/monitoring/vpa/helm-release.yaml | 24 ----- .../apps/monitoring/vpa/kustomization.yaml | 4 - .../presidential-paradise/kustomization.yaml | 2 - .../wooloofanclub/kustomization.yaml | 4 - .../wooloofanclub/wooloo.yaml | 98 ------------------- .../zookeeper/deployment.yaml | 53 ---------- .../zookeeper/external-secret.yaml | 33 ------- .../zookeeper/ingress.yaml | 17 ---- .../zookeeper/kustomization.yaml | 7 -- .../presidential-paradise/zookeeper/svc.yaml | 27 ----- 21 files changed, 428 deletions(-) delete mode 100644 flux/cluster/apps/gitops/drone/external-secret.yaml delete mode 100644 flux/cluster/apps/gitops/drone/kustomization.yaml delete mode 100644 flux/cluster/apps/gitops/drone/runner.yaml delete mode 100644 flux/cluster/apps/gitops/drone/server.yaml delete mode 100644 flux/cluster/apps/monitoring/goldilocks/helm-release.yaml delete mode 100644 flux/cluster/apps/monitoring/goldilocks/kustomization.yaml delete mode 100644 flux/cluster/apps/monitoring/kustomization.yaml delete mode 100644 flux/cluster/apps/monitoring/polaris/helm-release.yaml delete mode 100644 flux/cluster/apps/monitoring/polaris/kustomization.yaml delete mode 100644 flux/cluster/apps/monitoring/vpa/helm-release.yaml delete mode 100644 flux/cluster/apps/monitoring/vpa/kustomization.yaml delete mode 100644 flux/cluster/apps/presidential-paradise/wooloofanclub/kustomization.yaml delete mode 100644 flux/cluster/apps/presidential-paradise/wooloofanclub/wooloo.yaml delete mode 100644 flux/cluster/apps/presidential-paradise/zookeeper/deployment.yaml delete mode 100644 flux/cluster/apps/presidential-paradise/zookeeper/external-secret.yaml delete mode 100644 flux/cluster/apps/presidential-paradise/zookeeper/ingress.yaml delete mode 100644 flux/cluster/apps/presidential-paradise/zookeeper/kustomization.yaml delete mode 100644 flux/cluster/apps/presidential-paradise/zookeeper/svc.yaml diff --git a/flux/cluster/apps/gitops/drone/external-secret.yaml b/flux/cluster/apps/gitops/drone/external-secret.yaml deleted file mode 100644 index 11894dd..0000000 --- a/flux/cluster/apps/gitops/drone/external-secret.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: drone - namespace: gitops -spec: - refreshInterval: "5m" - secretStoreRef: - name: vault - kind: ClusterSecretStore - target: - name: drone - data: - - secretKey: DRONE_RPC_SECRET - remoteRef: - key: gitops/drone - property: drone_rpc_secret - - - secretKey: DRONE_GITEA_CLIENT_ID - remoteRef: - key: gitops/drone - property: drone_gitea_client_id - - - secretKey: DRONE_GITEA_CLIENT_SECRET - remoteRef: - key: gitops/drone - property: drone_gitea_client_secret diff --git a/flux/cluster/apps/gitops/drone/kustomization.yaml b/flux/cluster/apps/gitops/drone/kustomization.yaml deleted file mode 100644 index 8839b33..0000000 --- a/flux/cluster/apps/gitops/drone/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - server.yaml - - runner.yaml - - external-secret.yaml diff --git a/flux/cluster/apps/gitops/drone/runner.yaml b/flux/cluster/apps/gitops/drone/runner.yaml deleted file mode 100644 index 1cc17c0..0000000 --- a/flux/cluster/apps/gitops/drone/runner.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: drone-runner-kube - namespace: gitops -spec: - interval: 1h - chart: - spec: - chart: drone-runner-kube - version: 0.1.10 - sourceRef: - kind: HelmRepository - name: drone-charts - namespace: flux-system - valuesFrom: - - kind: Secret - name: drone - valuesKey: DRONE_RPC_SECRET - targetPath: env.DRONE_RPC_SECRET - values: - image: - repository: drone/drone-runner-kube - tag: 1.0.0-rc.3 - rbac: - buildNamespaces: - - drone-build - env: - DRONE_NAMESPACE_DEFAULT: drone-build - DRONE_RPC_HOST: "drone:8080" diff --git a/flux/cluster/apps/gitops/drone/server.yaml b/flux/cluster/apps/gitops/drone/server.yaml deleted file mode 100644 index e435144..0000000 --- a/flux/cluster/apps/gitops/drone/server.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: drone - namespace: gitops -spec: - interval: 1h - chart: - spec: - chart: drone - version: 0.5.0 - sourceRef: - kind: HelmRepository - name: drone-charts - namespace: flux-system - values: - image: - repository: drone/drone - tag: 2.12.1 - ingress: - enabled: true - hosts: - - host: drone.0x76.dev - paths: - - path: / - pathType: Prefix - persistentVolume: - enabled: false - extraSecretNamesForEnvFrom: - - drone - env: - DRONE_DATABASE_DRIVER: postgres - DRONE_DATABASE_DATASOURCE: postgres://drone@10.42.42.26/drone?sslmode=disable - DRONE_GIT_ALWAYS_AUTH: true - DRONE_GITEA_SERVER: https://git.0x76.dev - DRONE_SERVER_HOST: drone.0x76.dev - DRONE_SERVER_PROTO: https diff --git a/flux/cluster/apps/gitops/kustomization.yaml b/flux/cluster/apps/gitops/kustomization.yaml index 91f0de3..4ddab70 100644 --- a/flux/cluster/apps/gitops/kustomization.yaml +++ b/flux/cluster/apps/gitops/kustomization.yaml @@ -2,4 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - renovate - - drone diff --git a/flux/cluster/apps/kustomization.yaml b/flux/cluster/apps/kustomization.yaml index 8802a6a..5dc0ccd 100644 --- a/flux/cluster/apps/kustomization.yaml +++ b/flux/cluster/apps/kustomization.yaml @@ -4,5 +4,4 @@ resources: - networking - presidential-paradise - gitops - - monitoring - olympus diff --git a/flux/cluster/apps/monitoring/goldilocks/helm-release.yaml b/flux/cluster/apps/monitoring/goldilocks/helm-release.yaml deleted file mode 100644 index 9c3d2a2..0000000 --- a/flux/cluster/apps/monitoring/goldilocks/helm-release.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: goldilocks - namespace: monitoring -spec: - interval: 5m - chart: - spec: - chart: goldilocks - version: 6.1.4 - sourceRef: - kind: HelmRepository - name: fairwinds-charts - namespace: flux-system - interval: 5m - timeout: 20m - values: - dashboard: - replicaCount: 1 - ingress: - enabled: false diff --git a/flux/cluster/apps/monitoring/goldilocks/kustomization.yaml b/flux/cluster/apps/monitoring/goldilocks/kustomization.yaml deleted file mode 100644 index 34a8531..0000000 --- a/flux/cluster/apps/monitoring/goldilocks/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - helm-release.yaml diff --git a/flux/cluster/apps/monitoring/kustomization.yaml b/flux/cluster/apps/monitoring/kustomization.yaml deleted file mode 100644 index 98bb16b..0000000 --- a/flux/cluster/apps/monitoring/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - vpa - - goldilocks - - polaris diff --git a/flux/cluster/apps/monitoring/polaris/helm-release.yaml b/flux/cluster/apps/monitoring/polaris/helm-release.yaml deleted file mode 100644 index bd25c58..0000000 --- a/flux/cluster/apps/monitoring/polaris/helm-release.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: polaris - namespace: monitoring -spec: - interval: 5m - chart: - spec: - chart: polaris - version: 5.4.1 - sourceRef: - kind: HelmRepository - name: fairwinds-charts - namespace: flux-system - interval: 5m - timeout: 20m - values: - dashboard: - replicas: 1 - enable: true diff --git a/flux/cluster/apps/monitoring/polaris/kustomization.yaml b/flux/cluster/apps/monitoring/polaris/kustomization.yaml deleted file mode 100644 index 34a8531..0000000 --- a/flux/cluster/apps/monitoring/polaris/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - helm-release.yaml diff --git a/flux/cluster/apps/monitoring/vpa/helm-release.yaml b/flux/cluster/apps/monitoring/vpa/helm-release.yaml deleted file mode 100644 index 22504ab..0000000 --- a/flux/cluster/apps/monitoring/vpa/helm-release.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: vpa - namespace: monitoring -spec: - interval: 5m - chart: - spec: - chart: vpa - version: 1.4.0 - sourceRef: - kind: HelmRepository - name: fairwinds-charts - namespace: flux-system - interval: 5m - timeout: 20m - values: - recommender: - enabled: true - updater: - enabled: false - admissionController: - enabled: false diff --git a/flux/cluster/apps/monitoring/vpa/kustomization.yaml b/flux/cluster/apps/monitoring/vpa/kustomization.yaml deleted file mode 100644 index 34a8531..0000000 --- a/flux/cluster/apps/monitoring/vpa/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - helm-release.yaml diff --git a/flux/cluster/apps/presidential-paradise/kustomization.yaml b/flux/cluster/apps/presidential-paradise/kustomization.yaml index fb65b5a..43c6282 100644 --- a/flux/cluster/apps/presidential-paradise/kustomization.yaml +++ b/flux/cluster/apps/presidential-paradise/kustomization.yaml @@ -3,5 +3,3 @@ kind: Kustomization resources: - xirion-registry-creds.yaml - 0x76dev - - wooloofanclub - - zookeeper diff --git a/flux/cluster/apps/presidential-paradise/wooloofanclub/kustomization.yaml b/flux/cluster/apps/presidential-paradise/wooloofanclub/kustomization.yaml deleted file mode 100644 index 1f8410f..0000000 --- a/flux/cluster/apps/presidential-paradise/wooloofanclub/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - wooloo.yaml diff --git a/flux/cluster/apps/presidential-paradise/wooloofanclub/wooloo.yaml b/flux/cluster/apps/presidential-paradise/wooloofanclub/wooloo.yaml deleted file mode 100644 index c839834..0000000 --- a/flux/cluster/apps/presidential-paradise/wooloofanclub/wooloo.yaml +++ /dev/null @@ -1,98 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: wooloofan-club - namespace: presidential-paradise - labels: - app: wooloofan-club -spec: - replicas: 1 - selector: - matchLabels: - app: wooloofan-club - template: - metadata: - labels: - app: wooloofan-club - spec: - containers: - - name: wooloofan-club - image: 0x76/wooloofan.club - ports: - - containerPort: 80 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: wooloofan-club-whoami - namespace: presidential-paradise - labels: - app: wooloofan-club-whoami -spec: - replicas: 1 - selector: - matchLabels: - app: wooloofan-club-whoami - template: - metadata: - labels: - app: wooloofan-club-whoami - spec: - containers: - - name: wooloofan-club-whoami - image: containous/whoami - ports: - - containerPort: 80 ---- -apiVersion: v1 -kind: Service -metadata: - name: wooloofan-club-service - namespace: presidential-paradise -spec: - selector: - app: wooloofan-club - ports: - - protocol: TCP - port: 80 ---- -apiVersion: v1 -kind: Service -metadata: - name: wooloofan-club-whoami-service - namespace: presidential-paradise -spec: - selector: - app: wooloofan-club-whoami - ports: - - protocol: TCP - port: 80 ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: wooloofan-club-ingress - namespace: presidential-paradise -spec: - ingressClassName: "traefik" - rules: - - host: "wooloofan.club" - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: wooloofan-club-service - port: - number: 80 - - host: "whoami.wooloofan.club" - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: wooloofan-club-whoami-service - port: - number: 80 diff --git a/flux/cluster/apps/presidential-paradise/zookeeper/deployment.yaml b/flux/cluster/apps/presidential-paradise/zookeeper/deployment.yaml deleted file mode 100644 index 1404435..0000000 --- a/flux/cluster/apps/presidential-paradise/zookeeper/deployment.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: zookeeper - namespace: presidential-paradise - labels: - app: zookeeper -spec: - replicas: 1 - selector: - matchLabels: - app: zookeeper - strategy: - type: RollingUpdate - rollingUpdate: - maxSurge: 34% - maxUnavailable: 34% - template: - metadata: - name: zookeeper - labels: - app: zookeeper - spec: - imagePullSecrets: - - name: xirion-registry-creds - containers: - - name: zookeeper - image: registry.xirion.net/library/zookeeper:0.3.1 # {"$imagepolicy": "flux-system:zookeeper"} - ports: - - name: web - containerPort: 8085 - - name: epmd - containerPort: 4369 - envFrom: - - secretRef: - name: zookeeper - env: - - name: LANG - value: C.UTF-8 - - name: HOSTNAME - valueFrom: - fieldRef: - fieldPath: status.podIP - - name: SERVICE_NAME - value: zookeeper-private.presidential-paradise.svc.cluster.local - resources: {} - securityContext: - privileged: false - procMount: Default - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - dnsPolicy: ClusterFirst - terminationGracePeriodSeconds: 30 diff --git a/flux/cluster/apps/presidential-paradise/zookeeper/external-secret.yaml b/flux/cluster/apps/presidential-paradise/zookeeper/external-secret.yaml deleted file mode 100644 index fac7c6f..0000000 --- a/flux/cluster/apps/presidential-paradise/zookeeper/external-secret.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: zookeeper - namespace: presidential-paradise -spec: - refreshInterval: "5m" - secretStoreRef: - name: vault - kind: ClusterSecretStore - target: - name: zookeeper - data: - - secretKey: DISCORD_APP_ID - remoteRef: - key: presidential-paradise/zookeeper - property: discord_app_id - - secretKey: DISCORD_PUBLIC_KEY - remoteRef: - key: presidential-paradise/zookeeper - property: discord_public_key - - secretKey: DISCORD_TOKEN - remoteRef: - key: presidential-paradise/zookeeper - property: discord_token - - secretKey: TWITTER_TOKEN - remoteRef: - key: presidential-paradise/zookeeper - property: twitter_token - - secretKey: RELEASE_COOKIE - remoteRef: - key: presidential-paradise/zookeeper - property: erlang_cookie diff --git a/flux/cluster/apps/presidential-paradise/zookeeper/ingress.yaml b/flux/cluster/apps/presidential-paradise/zookeeper/ingress.yaml deleted file mode 100644 index 44a4280..0000000 --- a/flux/cluster/apps/presidential-paradise/zookeeper/ingress.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: zookeeper - namespace: presidential-paradise -spec: - rules: - - host: "zookeeper.0x76.dev" - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: zookeeper - port: - number: 8085 diff --git a/flux/cluster/apps/presidential-paradise/zookeeper/kustomization.yaml b/flux/cluster/apps/presidential-paradise/zookeeper/kustomization.yaml deleted file mode 100644 index 3716bd7..0000000 --- a/flux/cluster/apps/presidential-paradise/zookeeper/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - external-secret.yaml - - deployment.yaml - - svc.yaml - - ingress.yaml diff --git a/flux/cluster/apps/presidential-paradise/zookeeper/svc.yaml b/flux/cluster/apps/presidential-paradise/zookeeper/svc.yaml deleted file mode 100644 index e6ec808..0000000 --- a/flux/cluster/apps/presidential-paradise/zookeeper/svc.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: zookeeper-private - namespace: presidential-paradise -spec: - clusterIP: None - ports: - - name: epmd - port: 4369 - targetPort: epmd - protocol: TCP - selector: - app: zookeeper ---- -apiVersion: v1 -kind: Service -metadata: - name: zookeeper - namespace: presidential-paradise -spec: - ports: - - name: http - targetPort: web - port: 8085 - selector: - app: zookeeper