From bd5621a95d7f64bf70b4c0fcb6f2395c7797833b Mon Sep 17 00:00:00 2001
From: Mark Bzomowski <mbzomowski@gmail.com>
Date: Thu, 28 Sep 2023 22:07:04 +0000
Subject: [PATCH 1/2] Update tf-controller

---
 tpu-ci/configmap.yaml | 6 +++---
 tpu-ci/helm.tf        | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tpu-ci/configmap.yaml b/tpu-ci/configmap.yaml
index 3709eb0afbf..44e4f518e1e 100644
--- 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
index 5cbcad92952..f5c8f008a70 100644
--- a/tpu-ci/helm.tf
+++ b/tpu-ci/helm.tf
@@ -58,6 +58,7 @@ resource "helm_release" "tf-controller" {
   depends_on = [
     helm_release.flux
   ]
+  version = ">=0.16.0-rc.2"
   values = [
     "${file("tf-controller-values.yaml")}"
   ]

From a39cf6e0c31899d77883572b5cae56cb998eec6d Mon Sep 17 00:00:00 2001
From: Mark Bzomowski <mbzomowski@gmail.com>
Date: Fri, 29 Sep 2023 18:22:03 +0000
Subject: [PATCH 2/2] Remove branch planner from tf-controller

---
 tpu-ci/helm.tf                   |  4 ++--
 tpu-ci/k8s.tf                    | 11 -----------
 tpu-ci/tf-controller-values.yaml |  8 ++------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/tpu-ci/helm.tf b/tpu-ci/helm.tf
index f5c8f008a70..b06a5bedf81 100644
--- a/tpu-ci/helm.tf
+++ b/tpu-ci/helm.tf
@@ -52,13 +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.2"
+  version = "0.16.0-rc.3"
   values = [
     "${file("tf-controller-values.yaml")}"
   ]
diff --git a/tpu-ci/k8s.tf b/tpu-ci/k8s.tf
index 174393b3b77..64d6e65545c 100644
--- 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
index e7c2e8c26b1..8f0edd308a3 100644
--- 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