refactor istio to use imagetest_harness_k3s

Signed-off-by: Jamon <[email protected]>

images/istio/main.tf

@@ -8,8 +8,6 @@ variable "target_repository" {
   description = "The docker repo into which the image and attestations should be published."
 }
 
-resource "random_pet" "suffix" {}
-
 module "test-latest" {
   source = "./tests"
   digests = {
@@ -18,7 +16,6 @@ module "test-latest" {
     pilot       = module.pilot.image_ref
     operator    = module.operator.image_ref
   }
-  namespace = "istio-system-${random_pet.suffix.id}"
 }
 
 resource "oci_tag" "latest" {

images/istio/tests/base/main.tf

@@ -0,0 +1,33 @@
+terraform {
+  required_providers {
+    oci       = { source = "chainguard-dev/oci" }
+    imagetest = { source = "chainguard-dev/imagetest" }
+  }
+}
+
+variable "values" {
+  type = any
+  default = {
+    global = {
+      istioNamespace = "istio-system"
+    }
+    defaultRevision = ""
+  }
+}
+
+module "helm" {
+  source = "../../../../tflib/imagetest/helm"
+
+  chart = "base"
+  repo  = "https://istio-release.storage.googleapis.com/charts/"
+
+  values = var.values
+}
+
+output "install_cmd" {
+  value = module.helm.install_cmd
+}
+
+output "release_name" {
+  value = module.helm.release_name
+}

images/istio/tests/gateway/main.tf

@@ -0,0 +1,47 @@
+terraform {
+  required_providers {
+    oci       = { source = "chainguard-dev/oci" }
+    imagetest = { source = "chainguard-dev/imagetest" }
+  }
+}
+
+variable "values" {
+  type = any
+  default = {
+    revision = "istio"
+    service = {
+      type = "ClusterIP"
+    }
+    global = {
+      istioNamespace = "istio-system"
+      hub            = "cgr.dev/chainguard/istio-proxy"
+      proxy = {
+        image = "cgr.dev/chainguard/istio-proxy"
+      }
+      proxy-init = {
+        image = "cgr.dev/chainguard/istio-proxy"
+      }
+      tag = "latest"
+    }
+    version   = "1.19.0"
+    namespace = "istio-system"
+  }
+}
+
+module "helm" {
+  source = "../../../../tflib/imagetest/helm"
+
+  namespace = var.values.namespace
+  repo      = "https://istio-release.storage.googleapis.com/charts/"
+  chart     = "gateway"
+
+  values = var.values
+}
+
+output "install_cmd" {
+  value = module.helm.install_cmd
+}
+
+output "release_name" {
+  value = module.helm.release_name
+}

images/istio/tests/install-cni/main.tf

@@ -0,0 +1,44 @@
+terraform {
+  required_providers {
+    oci       = { source = "chainguard-dev/oci" }
+    imagetest = { source = "chainguard-dev/imagetest" }
+  }
+}
+
+variable "values" {
+  type = any
+  default = {
+    revision = "istio"
+    cni = {
+      image      = "cgr.dev/chainguard/istio-install-cni"
+      tag        = "latest"
+      cniBinDir  = "/var/lib/rancher/k3s/data/current/bin"
+      cniConfDir = "/var/lib/rancher/k3s/agent/etc/cni/net.d"
+    }
+    global = {
+      hub = "cgr.dev/chainguard/istio-install-cni"
+      tag = "latest"
+    }
+    version   = "1.19.0"
+    namespace = "istio-system"
+  }
+}
+
+module "helm" {
+  source = "../../../../tflib/imagetest/helm"
+
+  namespace = var.values.namespace
+  name      = "istio-cni"
+  repo      = "https://istio-release.storage.googleapis.com/charts/"
+  chart     = "cni"
+
+  values = var.values
+}
+
+output "install_cmd" {
+  value = module.helm.install_cmd
+}
+
+output "release_name" {
+  value = module.helm.release_name
+}

images/istio/tests/istiod/main.tf

@@ -0,0 +1,47 @@
+terraform {
+  required_providers {
+    oci       = { source = "chainguard-dev/oci" }
+    imagetest = { source = "chainguard-dev/imagetest" }
+  }
+}
+
+variable "values" {
+  type = any
+  default = {
+    revision = "istio-system"
+    pilot = {
+      image = "cgr.dev/chainguard/istio-pilot"
+    }
+    global = {
+      istioNamespace = "istio-system"
+      hub            = "cgr.dev/chainguard/istio-proxy"
+      proxy = {
+        image = "cgr.dev/chainguard/istio-proxy"
+      }
+      proxy-init = {
+        image = "cgr.dev/chainguard/istio-proxy"
+      }
+      tag = "latest"
+    }
+    version   = "1.19.0"
+    namespace = "istio-system"
+  }
+}
+
+module "helm" {
+  source = "../../../../tflib/imagetest/helm"
+
+  namespace = var.values.namespace
+  repo      = "https://istio-release.storage.googleapis.com/charts/"
+  chart     = "istiod"
+
+  values = var.values
+}
+
+output "install_cmd" {
+  value = module.helm.install_cmd
+}
+
+output "release_name" {
+  value = module.helm.release_name
+}