Swap away from OCI for flux

Sage-Bionetworks-Workflows · Nov 7, 2024 · 37c8e43 · 37c8e43
1 parent 59f9532
commit 37c8e43
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/deployments/stacks/dpe-k8s-deployments/provider.tf b/deployments/stacks/dpe-k8s-deployments/provider.tf
@@ -13,14 +13,6 @@ provider "helm" {
   kubernetes {
     config_path = var.kube_config_path
   }
-
-  registry {
-    url = "oci://ghcr.io"
-    # TODO: Is there a service account we can use instead of my personal account?
-    username = "BryanFauble"
-    # Requires that a secret be created in spacelift TF_VAR_github_container_repository_token
-    password = var.github_container_repository_token
-  }
 }
 
 provider "spotinst" {

diff --git a/deployments/stacks/dpe-k8s-deployments/variables.tf b/deployments/stacks/dpe-k8s-deployments/variables.tf
@@ -103,8 +103,3 @@ variable "smtp_from" {
   type        = string
   default     = ""
 }
-
-variable "github_container_repository_token" {
-  description = "The GitHub container repository token. Used to authenticate with the container registry for OCI based helm charts."
-  type        = string
-}
diff --git a/modules/flux-cd/main.tf b/modules/flux-cd/main.tf
@@ -5,8 +5,8 @@ resource "kubernetes_namespace" "flux-system" {
 }
 
 resource "helm_release" "fluxcd" {
-  name       = "argo-cd"
-  repository = "oci://ghcr.io/fluxcd-community/charts/flux2"
+  name       = "flux2"
+  repository = "https://fluxcd-community.github.io/helm-charts"
   chart      = "flux2"
   namespace  = "flux-system"
   version    = "2.14.0"