reset old dir

f0ssel · f0ssel · commit a8475335506b · 2024-12-02T16:01:17.000Z
diff --git a/scaletest/terraform/k8s/cert-manager.tf b/scaletest/terraform/k8s/cert-manager.tf
@@ -36,54 +36,32 @@ EOF
   ]
 }
 
-# resource "kubernetes_manifest" "cloudflare-cluster-issuer" {
-#   manifest = {
-#     apiVersion = "cert-manager.io/v1"
-#     kind       = "ClusterIssuer"
-#     metadata = {
-#       name = "cloudflare-issuer"
-#     }
-#     spec = {
-#       acme = {
-#         email = var.cloudflare_email
-#         privateKeySecretRef = {
-#           name = local.cloudflare_issuer_private_key_secret_name
-#         }
-#         solvers = [
-#           {
-#             dns01 = {
-#               cloudflare = {
-#                 apiTokenSecretRef = {
-#                   name = kubernetes_secret.cloudflare-api-key.metadata.0.name
-#                   key  = "api-token"
-#                 }
-#               }
-#             }
-#           }
-#         ]
-#       }
-#     }
-#   }
-# }
-
-resource "kubectl_manifest" "cloudflare-cluster-issuer" {
-  depends_on = [ helm_release.cert-manager ]
-    yaml_body = <<YAML
-apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
-metadata:
-  name: cloudflare-issuer
-spec:
-  acme:
-    email: ${var.cloudflare_email}
-    server: https://acme-staging-v02.api.letsencrypt.org/directory
-    privateKeySecretRef:
-      name: ${local.cloudflare_issuer_private_key_secret_name}
-    solvers:
-      - dns01:
-          cloudflare:
-            apiTokenSecretRef:
-              name: ${kubernetes_secret.cloudflare-api-key.metadata.0.name}
-              key: api-token
-YAML
+resource "kubernetes_manifest" "cloudflare-cluster-issuer" {
+  manifest = {
+    apiVersion = "cert-manager.io/v1"
+    kind       = "ClusterIssuer"
+    metadata = {
+      name = "cloudflare-issuer"
+    }
+    spec = {
+      acme = {
+        email = var.cloudflare_email
+        privateKeySecretRef = {
+          name = local.cloudflare_issuer_private_key_secret_name
+        }
+        solvers = [
+          {
+            dns01 = {
+              cloudflare = {
+                apiTokenSecretRef = {
+                  name = kubernetes_secret.cloudflare-api-key.metadata.0.name
+                  key  = "api-token"
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
 }
diff --git a/scaletest/terraform/k8s/coder.tf b/scaletest/terraform/k8s/coder.tf
@@ -10,7 +10,6 @@ locals {
   coder_release_name        = var.name
   provisionerd_helm_chart   = "coder-provisioner"
   provisionerd_release_name = "${var.name}-provisionerd"
-  dnsNames = regex("https?://([^/]+)", local.coder_url)
 }
 
 resource "kubernetes_namespace" "coder_namespace" {
@@ -62,49 +61,31 @@ data "kubernetes_secret" "coder_oidc" {
   }
 }
 
-# resource "kubernetes_manifest" "coder_certificate" {
-#   manifest = {
-#     apiVersion = "cert-manager.io/v1"
-#     kind       = "Certificate"
-#     metadata = {
-#       name      = "${var.name}"
-#       namespace = kubernetes_namespace.coder_namespace.metadata.0.name
-#     }
-#     spec = {
-#       secretName = "${var.name}-tls"
-#       dnsNames   = regex("https?://([^/]+)", local.coder_url)
-#       issuerRef = {
-#         name = "cloudflare-issuer"
-#         kind = "ClusterIssuer"
-#       }
-#     }
-#   }
-# }
-
-resource "kubectl_manifest" "coder_certificate" {
-  depends_on = [ helm_release.cert-manager ]
-  yaml_body = <<YAML
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: ${var.name}
-  namespace: ${kubernetes_namespace.coder_namespace.metadata.0.name}
-spec:
-  secretName: ${var.name}-tls
-  dnsNames:
-    - ${local.dnsNames.0}
-  issuerRef:
-    name: cloudflare-issuer
-    kind: ClusterIssuer
-YAML
+resource "kubernetes_manifest" "coder_certificate" {
+  manifest = {
+    apiVersion = "cert-manager.io/v1"
+    kind       = "Certificate"
+    metadata = {
+      name      = "${var.name}"
+      namespace = kubernetes_namespace.coder_namespace.metadata.0.name
+    }
+    spec = {
+      secretName = "${var.name}-tls"
+      dnsNames   = regex("https?://([^/]+)", local.coder_url)
+      issuerRef = {
+        name = kubernetes_manifest.cloudflare-cluster-issuer.manifest.metadata.name
+        kind = "ClusterIssuer"
+      }
+    }
+  }
 }
 
 data "kubernetes_secret" "coder_tls" {
   metadata {
     namespace = kubernetes_namespace.coder_namespace.metadata.0.name
     name      = "${var.name}-tls"
   }
-  depends_on = [kubectl_manifest.coder_certificate]
+  depends_on = [kubernetes_manifest.coder_certificate]
 }
 
 resource "helm_release" "coder-chart" {
@@ -172,29 +153,29 @@ coder:
           key: psk
           name: "${kubernetes_secret.provisionerd_psk.metadata.0.name}"
     # Enable OIDC
-    # - name: "CODER_OIDC_ISSUER_URL"
-    #   valueFrom:
-    #     secretKeyRef:
-    #       key: issuer-url
-    #       name: "${data.kubernetes_secret.coder_oidc.metadata.0.name}"
-    # - name: "CODER_OIDC_EMAIL_DOMAIN"
-    #   valueFrom:
-    #     secretKeyRef:
-    #       key: email-domain
-    #       name: "${data.kubernetes_secret.coder_oidc.metadata.0.name}"
-    # - name: "CODER_OIDC_CLIENT_ID"
-    #   valueFrom:
-    #     secretKeyRef:
-    #       key: client-id
-    #       name: "${data.kubernetes_secret.coder_oidc.metadata.0.name}"
-    # - name: "CODER_OIDC_CLIENT_SECRET"
-    #   valueFrom:
-    #     secretKeyRef:
-    #       key: client-secret
-    #       name: "${data.kubernetes_secret.coder_oidc.metadata.0.name}"
+    - name: "CODER_OIDC_ISSUER_URL"
+      valueFrom:
+        secretKeyRef:
+          key: issuer-url
+          name: "${data.kubernetes_secret.coder_oidc.metadata.0.name}"
+    - name: "CODER_OIDC_EMAIL_DOMAIN"
+      valueFrom:
+        secretKeyRef:
+          key: email-domain
+          name: "${data.kubernetes_secret.coder_oidc.metadata.0.name}"
+    - name: "CODER_OIDC_CLIENT_ID"
+      valueFrom:
+        secretKeyRef:
+          key: client-id
+          name: "${data.kubernetes_secret.coder_oidc.metadata.0.name}"
+    - name: "CODER_OIDC_CLIENT_SECRET"
+      valueFrom:
+        secretKeyRef:
+          key: client-secret
+          name: "${data.kubernetes_secret.coder_oidc.metadata.0.name}"
     # Send OTEL traces to the cluster-local collector to sample 10%
     - name: "OTEL_EXPORTER_OTLP_ENDPOINT"
-      value: "http://otel-collector.${kubernetes_namespace.coder_namespace.metadata.0.name}.svc.cluster.local:4317"
+      value: "http://${kubernetes_manifest.otel-collector.manifest.metadata.name}-collector.${kubernetes_namespace.coder_namespace.metadata.0.name}.svc.cluster.local:4317"
     - name: "OTEL_TRACES_SAMPLER"
       value: parentbased_traceidratio
     - name: "OTEL_TRACES_SAMPLER_ARG"
@@ -259,8 +240,6 @@ coder:
       value: "${local.coder_url}"
     - name: "CODER_VERBOSE"
       value: "true"
-    - name: "CODER_CONFIG_DIR"
-      value: "/tmp/config"
     - name: "CODER_CACHE_DIRECTORY"
       value: "/tmp/coder"
     - name: "CODER_TELEMETRY_ENABLE"
@@ -272,7 +251,7 @@ coder:
     - name: "CODER_PROMETHEUS_ENABLE"
       value: "true"
     - name: "CODER_PROVISIONERD_TAGS"
-      value: "scope=organization"
+      value = "socpe=organization"
   image:
     repo: ${var.provisionerd_image_repo}
     tag: ${var.provisionerd_image_tag}
diff --git a/scaletest/terraform/k8s/main.tf b/scaletest/terraform/k8s/main.tf
@@ -5,11 +5,6 @@ terraform {
       version = "~> 2.20"
     }
 
-    kubectl = {
-      source  = "alekc/kubectl"
-      version = ">= 2.0.0"
-    }
-
     helm = {
       source  = "hashicorp/helm"
       version = "~> 2.9"
@@ -26,17 +21,13 @@ terraform {
     }
   }
 
-  required_version = "~> 1.9.0"
+  required_version = "~> 1.5.0"
 }
 
 provider "kubernetes" {
   config_path = var.kubernetes_kubeconfig_path
 }
 
-provider "kubectl" {
-  config_path = var.kubernetes_kubeconfig_path
-}
-
 provider "helm" {
   kubernetes {
     config_path = var.kubernetes_kubeconfig_path
diff --git a/scaletest/terraform/k8s/otel.tf b/scaletest/terraform/k8s/otel.tf
@@ -3,7 +3,7 @@
 locals {
   otel_namespace              = "opentelemetry-operator-system"
   otel_operator_helm_repo     = "https://open-telemetry.github.io/opentelemetry-helm-charts"
-  otel_operator_helm_chart    = "opentelemetry-operator"
+  otel_operator_helm_chart    = "opentelemtry-operator"
   otel_operator_release_name  = "opentelemetry-operator"
   otel_operator_chart_version = "0.34.1"
 }
@@ -22,83 +22,48 @@ resource "helm_release" "otel-operator" {
   chart      = local.otel_operator_helm_chart
   name       = local.otel_operator_release_name
   namespace  = kubernetes_namespace.otel-namespace.metadata.0.name
-  values = [<<EOF
-manager:
-  collectorImage:
-    repository: otel/opentelemetry-collector-k8s
-EOF
-  ]
+  # Default values
+  values = []
 }
 
-# resource "kubernetes_manifest" "otel-collector" {
-#   manifest = {
-#     apiVersion = "opentelemetry.io/v1alpha1"
-#     kind       = "OpenTelemetryCollector"
-#     metadata = {
-#       namespace = kubernetes_namespace.coder_namespace.metadata.0.name
-#       name      = "otel"
-#     }
-#     spec = {
-#       config = jsonencode({
-#         receivers = {
-#           otlp = {
-#             protocols : {
-#               grpc : {}
-#               http : {}
-#             }
-#           }
-#         }
-#         exporters = {
-#           googlecloud = {
-#             logging = {
-#               loglevel = "debug"
-#             }
-#           }
-#         }
-#         service = {
-#           pipelines = {
-#             traces = {
-#               receivers  = ["otlp"]
-#               processors = []
-#               exporters  = ["logging", "googlecloud"]
-#             }
-#           }
-#         }
-#         image    = "otel/open-telemetry-collector-contrib:latest"
-#         mode     = "deployment"
-#         replicas = 1
-#       })
-#     }
-#   }
-# }
-
-resource "kubectl_manifest" "otel-collector" {
-  depends_on = [ helm_release.otel-operator ]
-    yaml_body = <<YAML
-apiVersion: opentelemetry.io/v1alpha1
-kind: OpenTelemetryCollector
-metadata:
-  name: otel
-  namespace: ${kubernetes_namespace.coder_namespace.metadata.0.name}
-spec:
-  config: |
-    receivers:
-      otlp:
-        protocols:
-          grpc: {}
-          http: {}
-    exporters:
-      googlecloud:
-        logging:
-          loglevel: debug
-    service:
-      pipelines:
-        traces:
-          receivers: [otlp]
-          processors: []
-          exporters: [logging, googlecloud]
-    image: otel/open-telemetry-collector-contrib:latest
-    mode: deployment
-    replicas: 1
-YAML
+resource "kubernetes_manifest" "otel-collector" {
+  manifest = {
+    apiVersion = "opentelemetry.io/v1alpha1"
+    kind       = "OpenTelemetryCollector"
+    metadata = {
+      namespace = kubernetes_namespace.coder_namespace.metadata.0.name
+      name      = "otel"
+    }
+    spec = {
+      config = jsonencode({
+        receivers = {
+          otlp = {
+            protocols : {
+              grpc : {}
+              http : {}
+            }
+          }
+        }
+        exporters = {
+          googlecloud = {
+            logging = {
+              loglevel = "debug"
+            }
+          }
+        }
+        service = {
+          pipelines = {
+            traces = {
+              receivers  = ["otlp"]
+              processors = []
+              exporters  = ["logging", "googlecloud"]
+            }
+          }
+        }
+        image    = "otel/open-telemetry-collector-contrib:latest"
+        mode     = "deployment"
+        replicas = 1
+      })
+    }
+  }
 }
diff --git a/scaletest/terraform/k8s/prometheus.tf b/scaletest/terraform/k8s/prometheus.tf

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,6 @@ terraform {`
`5`	`5`	`version = "~> 2.20"`
`6`	`6`	`}`
`7`	`7`
`8`		`- kubectl = {`
`9`		`- source = "alekc/kubectl"`
`10`		`- version = ">= 2.0.0"`
`11`		`- }`
`12`		`-`
`13`	`8`	`helm = {`
`14`	`9`	`source = "hashicorp/helm"`
`15`	`10`	`version = "~> 2.9"`
`@@ -26,17 +21,13 @@ terraform {`
`26`	`21`	`}`
`27`	`22`	`}`
`28`	`23`
`29`		`- required_version = "~> 1.9.0"`
	`24`	`+ required_version = "~> 1.5.0"`
`30`	`25`	`}`
`31`	`26`
`32`	`27`	`provider "kubernetes" {`
`33`	`28`	`config_path = var.kubernetes_kubeconfig_path`
`34`	`29`	`}`
`35`	`30`
`36`		`-provider "kubectl" {`
`37`		`- config_path = var.kubernetes_kubeconfig_path`
`38`		`-}`
`39`		`-`
`40`	`31`	`provider "helm" {`
`41`	`32`	`kubernetes {`
`42`	`33`	`config_path = var.kubernetes_kubeconfig_path`