Merge pull request #5 from mbzomowski/test_branch

Test branch
mbzomowski-test-org · Sep 29, 2023 · 0ba0850 · 0ba0850
2 parents bd992eb + a39cf6e
commit 0ba0850
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/tpu-ci/configmap.yaml b/tpu-ci/configmap.yaml
@@ -1,4 +1,4 @@
 secretName: github-pat
-resources:
-- namespace: "flux-system"
-- namespace: "arc-system"
+resources: |-
+  - namespace: "flux-system"
+  - namespace: "arc-system"
diff --git a/tpu-ci/helm.tf b/tpu-ci/helm.tf
@@ -52,12 +52,13 @@ resource "helm_release" "flux" {
 
 resource "helm_release" "tf-controller" {
   name = "tf-controller"
-  repository = "https://weaveworks.github.io/tf-controller/"
+  repository = "oci://ghcr.io/weaveworks/charts"
   chart = "tf-controller"
   namespace = var.flux_namespace
   depends_on = [
     helm_release.flux
   ]
+  version = "0.16.0-rc.3"
   values = [
     "${file("tf-controller-values.yaml")}"
   ]

diff --git a/tpu-ci/k8s.tf b/tpu-ci/k8s.tf
@@ -50,14 +50,3 @@ resource "kubernetes_manifest" "flux-terraform" {
     helm_release.tf-controller
   ]
 }
-
-resource "kubernetes_config_map" "configmap" {
-  metadata {
-    name = "branch-planner"
-    namespace = "flux-system"
-  }
-
-  data = {
-    "configmap.yaml" = "${file("${path.module}/configmap.yaml")}"
-  }
-}
diff --git a/tpu-ci/tf-controller-values.yaml b/tpu-ci/tf-controller-values.yaml
@@ -10,13 +10,9 @@ resources:
 caCertValidityDuration: 24h
 certRotationCheckFrequency: 30m
 image:
-  tag: v0.16.0-rc.2
+  tag: v0.16.0-rc.3
 runner:
   image:
-    tag: v0.16.0-rc.2
+    tag: v0.16.0-rc.3
   grpc:
     maxMessageSize: 30
-branchPlanner:
-  enabled: true
-  image:
-    tag: v0.16.0-rc.2