define repositories and modify runtime chart

pluralsh · Jan 1, 2024 · 96d7969 · 96d7969
1 parent f5485fd
commit 96d7969
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 25 deletions.
diff --git a/apps/repositories/console.yaml b/apps/repositories/console.yaml
@@ -0,0 +1,9 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: console
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+spec:
+  interval: 5m0s
+  url: https://pluralsh.github.io/console
diff --git a/apps/repositories/runtime.yaml b/apps/repositories/runtime.yaml
@@ -0,0 +1,9 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: runtime
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+spec:
+  interval: 5m0s
+  url: https://pluralsh.github.io/bootstrap
diff --git a/apps/services/console.yaml b/apps/services/console.yaml
diff --git a/charts/runtime/Chart.yaml b/charts/runtime/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: runtime
 description: Sets up the basic dependencies needed to get a network stack running
 type: application
-version: 0.1.9
+version: 0.1.10
 appVersion: "0.1.0"
 dependencies:
 - name: external-dns

diff --git a/charts/runtime/templates/helmrepositories.yaml b/charts/runtime/templates/helmrepositories.yaml
@@ -18,23 +18,3 @@ metadata:
 spec:
   interval: 5m0s
   url: https://flagger.app
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
-metadata:
-  name: console
-  annotations:
-    "helm.sh/hook": post-install,post-upgrade
-spec:
-  interval: 5m0s
-  url: https://pluralsh.github.io/console
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
-metadata:
-  name: bootstrap
-  annotations:
-    "helm.sh/hook": post-install,post-upgrade
-spec:
-  interval: 5m0s
-  url: https://pluralsh.github.io/bootstrap
diff --git a/templates/setup/cd.tf b/templates/setup/cd.tf
@@ -26,12 +26,12 @@ resource "plural_git_repository" "infra" {
 resource "plural_service_deployment" "helm-repositories" {
     name = "helm-repositories"
     namespace = kubernetes_namespace.infra.metadata.name
-    repository {
+    repository = {
         id = plural_git_repository.infra.id
         ref = "main"
         folder = "apps/repositories"
     }
-    cluster {
+    cluster = {
         id = data.plural_cluster.mgmt.id
     }
     protect = true
@@ -40,12 +40,12 @@ resource "plural_service_deployment" "helm-repositories" {
 resource "plural_service_deployment" "apps" {
     name = "apps"
     namespace = kubernetes_namespace.infra.metadata.name
-    repository {
+    repository = {
         id = plural_git_repository.infra.id
         ref = "main"
         folder = "apps/services"
     }
-    cluster {
+    cluster = {
         id = data.plural_cluster.mgmt.id
     }
     protect = true