From 6b9a401c9745f44840519bce41873934753e3112 Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Wed, 11 Oct 2023 14:37:43 +0200 Subject: [PATCH] wip: Some changes --- examples/one-config/helmfile.yaml | 125 +++++++++++++++++++++++++++++ internal/config/release/release.go | 9 ++- shoebill.yaml | 90 +++++++++++++++++++++ 3 files changed, 220 insertions(+), 4 deletions(-) create mode 100644 shoebill.yaml diff --git a/examples/one-config/helmfile.yaml b/examples/one-config/helmfile.yaml index d44a9a9..1432ced 100644 --- a/examples/one-config/helmfile.yaml +++ b/examples/one-config/helmfile.yaml @@ -13,3 +13,128 @@ releases: installed: true createNamespace: true chart: fluxcd-community/flux2 + + - <<: *metrics-server + installed: true + namespace: kube-system + createNamespace: false + + - <<: *istio-base + installed: true + namespace: istio-system + createNamespace: false + + - <<: *istio-gateway + installed: true + namespace: istio-system + createNamespace: false + + - <<: *istiod + installed: true + namespace: istio-system + createNamespace: false + + - <<: *cert-manager + installed: true + namespace: cert-manager + createNamespace: false + + - <<: *minio + installed: true + namespace: minio-service + createNamespace: false + + - <<: *openvpn + installed: true + namespace: openvpn-service + createNamespace: false + + - <<: *metallb + installed: true + namespace: metallb-system + createNamespace: true + + - <<: *drone + installed: true + namespace: drone-service + createNamespace: false + + - <<: *drone-runner-docker + installed: true + namespace: drone-service + createNamespace: false + + - <<: *longhorn + installed: true + namespace: longhorn-system + createNamespace: false + + - <<: *argocd + installed: true + namespace: argo-system + createNamespace: false + + - <<: *nrodionov + installed: true + namespace: nrodionov-application + createNamespace: false + + - <<: *minecraft + installed: true + namespace: minecraft-application + createNamespace: false + + - <<: *gitea + installed: true + namespace: gitea-service + createNamespace: false + + - <<: *funkwhale + installed: true + namespace: funkwhale-application + createNamespace: false + + - <<: *prometheus + installed: true + namespace: monitoring-system + createNamespace: true + + - <<: *loki + installed: false + namespace: monitoring-system + createNamespace: false + + - <<: *promtail + installed: false + namespace: monitoring-system + createNamespace: false + + - <<: *bitwarden + installed: true + namespace: bitwarden-application + createNamespace: true + + - <<: *redis + installed: true + namespace: database-service + createNamespace: true + + - <<: *postgres16 + installed: true + namespace: database-service + createNamespace: true + + - <<: *db-operator + installed: true + namespace: database-service + createNamespace: true + + - <<: *db-instances + installed: true + namespace: database-service + createNamespace: true + + - <<: *mysql + installed: true + namespace: database-service + createNamespace: true diff --git a/internal/config/release/release.go b/internal/config/release/release.go index 48fbd11..83f406b 100644 --- a/internal/config/release/release.go +++ b/internal/config/release/release.go @@ -105,10 +105,11 @@ func FindReleaseByNames(releases []string, releasesObj Releases) Releases { func ReleasesFromLockfile(lockfile lockfile.LockFile, repos repository.Repositories) (Releases, error) { releases := Releases{} for _, releaseLocked := range lockfile { - repoName, err := repos.NameByUrl(releaseLocked.RepoUrl) - if err != nil { - return releases, err - } + // repoName, err := repos.NameByUrl(releaseLocked.RepoUrl) + repoName := releaseLocked.RepoName + // if err != nil { + // return releases, err + // } release := &Release{ Repository: repoName, Release: releaseLocked.Release, diff --git a/shoebill.yaml b/shoebill.yaml new file mode 100644 index 0000000..e73888d --- /dev/null +++ b/shoebill.yaml @@ -0,0 +1,90 @@ +--- +repositories: + - name: metrics-server + url: https://kubernetes-sigs.github.io/metrics-server/ + - name: jetstack + url: https://charts.jetstack.io + - name: istio + url: https://istio-release.storage.googleapis.com/charts + - name: drone + url: https://charts.drone.io + - name: bitnami + url: https://charts.bitnami.com/bitnami + - name: minio + url: https://charts.min.io/ + - name: minecraft-server-charts + url: https://itzg.github.io/minecraft-server-charts/ + - name: longhorn + url: https://charts.longhorn.io + - name: gitea + url: https://dl.gitea.io/charts/ + - name: ananace-charts + url: https://ananace.gitlab.io/charts + - name: argo + url: https://argoproj.github.io/argo-helm + - name: bedag + url: https://bedag.github.io/helm-charts/ + - name: metallb + url: https://metallb.github.io/metallb + - name: prometheus-community + url: https://prometheus-community.github.io/helm-charts + - name: grafana + url: https://grafana.github.io/helm-charts + - name: bitwarden + url: https://constin.github.io/vaultwarden-helm/ + - name: db-operator + url: https://db-operator.github.io/charts + - name: allanger-gitea + url: https://git.badhouseplants.net/api/packages/allanger/helm + +releases: + - name: metrics-server + repository: metrics-server + chart: metrics-server + version: 3.11.0 + values: + - common/values.metrics-server.yaml + installed: true + namespace: kube-system + createNamespace: false + + - name: istio-base + repository: istio + chart: base + installed: true + namespace: istio-system + createNamespace: false + version: 1.19.2 + + - name: istio-ingressgateway + repository: istio + chart: gateway + version: 1.19.2 + installed: true + namespace: istio-system + createNamespace: false + + - name: istiod + repository: istio + chart: istiod + installed: true + namespace: istio-system + createNamespace: false + +clusters: + - name: cluster-shoebill-test + git: git@git.badhouseplants.net:allanger/shoebill-test.git + dotsops: | + creation_rules: + - path_regex: secrets/.*.yaml + key_groups: + - age: + - age16svfskd8x75g62f5uwpmgqzth52rr3wgv9m6rxchqv6v6kzmzf0qvhr2pk + provider: flux + releases: + - metrics-server + - istio-base + - istio-ingressgateway + - istiod + +