diff --git a/terraform/cert-manager-files/cert.yaml b/terraform/cert-manager-files/cert.yaml index d92afca..08e6c02 100644 --- a/terraform/cert-manager-files/cert.yaml +++ b/terraform/cert-manager-files/cert.yaml @@ -1,11 +1,11 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: ${NAME}-cis1880-org + name: ${NAME}-cis1912-org spec: - secretName: ${NAME}-cis1880-org-tls + secretName: ${NAME}-cis1912-org-tls dnsNames: - - "${NAME}.cis1880.org" + - "${NAME}.cis1912.org" issuerRef: name: letsencrypt-prod kind: ClusterIssuer diff --git a/terraform/helm/grafana.yaml b/terraform/helm/grafana.yaml index 257b747..08b8622 100644 --- a/terraform/helm/grafana.yaml +++ b/terraform/helm/grafana.yaml @@ -1,11 +1,11 @@ ingress: enabled: true hosts: - - grafana.cis1880.org + - grafana.cis1912.org tls: - - secretName: grafana-cis1880-org-tls + - secretName: grafana-cis1912-org-tls hosts: - - grafana.cis1880.org + - grafana.cis1912.org admin: existingSecret: grafana @@ -57,7 +57,7 @@ datasources: grafana.ini: server: - domain: "grafana.cis1880.org" + domain: "grafana.cis1912.org" root_url: "https://%(domain)s/" auth.github: enabled: true @@ -66,6 +66,6 @@ grafana.ini: token_url: https://github.com/login/oauth/access_token api_url: https://api.github.com/user allow_sign_up: true - allowed_organizations: cis1880 + allowed_organizations: cis1912 envFromSecret: "grafana" diff --git a/terraform/main.tf b/terraform/main.tf index 4dda931..71da64e 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -1,9 +1,9 @@ locals { // Name of the homework mapped to published status published = { - hw0 = true - hw1 = true - hw2 = true + hw0 = false + hw1 = false + hw2 = false hw3 = false hw4 = false final_project = false @@ -16,7 +16,7 @@ locals { } ] ]) - bot_user = "cis188bot" - k8s_cluster_name = "cis188" + bot_user = "cis1912bot" + k8s_cluster_name = "cis1912" users = merge(var.students, var.instructors, var.tas) } diff --git a/terraform/modules/hw_repo/main.tf b/terraform/modules/hw_repo/main.tf index f476738..dca183e 100644 --- a/terraform/modules/hw_repo/main.tf +++ b/terraform/modules/hw_repo/main.tf @@ -4,7 +4,7 @@ resource "github_repository" "hw" { visibility = "private" template { - owner = "cis1880" + owner = "cis1912" repository = var.hw } } diff --git a/terraform/provider.tf b/terraform/provider.tf index 77049d1..467b71e 100644 --- a/terraform/provider.tf +++ b/terraform/provider.tf @@ -18,7 +18,7 @@ provider "kubernetes" { } provider "github" { - organization = "cis1880" + organization = "cis1912" } terraform { diff --git a/terraform/variables.tf b/terraform/variables.tf index 30b93f5..d2ea441 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -20,12 +20,12 @@ variable "image_pull_pat" { variable "GF_GH_CLIENT_ID" { type = string - description = "GitHub Client ID for the CIS1880 Grafana OAuth2 Application" + description = "GitHub Client ID for the CIS1912 Grafana OAuth2 Application" } variable "GF_GH_CLIENT_SECRET" { type = string - description = "GitHub Client Secret for the CIS1880 Grafana OAuth2 Application" + description = "GitHub Client Secret for the CIS1912 Grafana OAuth2 Application" } variable "emails" {