🎉 Release HW0

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

terraform/github.tf

@@ -27,10 +27,11 @@ module "hws" {
     for hw in local.hws : "${hw.hw}-${hw.student}" => hw
     if hw != "hw0" && hw != "hw1" && hw != "hw2"
   }
-  source      = "./modules/hw_repo"
-  hw          = each.value.hw
-  pennkey     = each.value.student
-  team-id     = github_team.teams[each.value.student].id
-  bot-team-id = github_team.bot.id
-  published   = each.value.published
+  source          = "./modules/hw_repo"
+  hw              = each.value.hw
+  pennkey         = each.value.student
+  github-username = local.users[each.value.student]
+  team-id         = github_team.teams[each.value.student].id
+  bot-team-id     = github_team.bot.id
+  published       = each.value.published
 }

terraform/github_bot.tf

@@ -20,6 +20,11 @@ resource "github_repository" "hw" {
   lifecycle {
     prevent_destroy = true
   }
+
+  template {
+    repository = each.key
+    owner      = "cis1912"
+  }
 }
 
 // Grant bot user push access to hw repos
@@ -43,11 +48,21 @@ resource "github_team_membership" "bot" {
   }
 }
 
-resource "github_team_repository" "bot" {
-  for_each   = local.published
-  team_id    = github_team.bot.id
+resource "github_repository_collaborators" "bot" {
+  for_each = local.published
+
   repository = each.key
-  permission = "push"
+
+  user {
+    permission = "admin"
+    username   = local.bot_user
+  }
+
+  team {
+    permission = "push"
+    team_id    = github_team.bot.id
+  }
+
 
   lifecycle {
     prevent_destroy = true

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"

terraform/main.tf

@@ -1,7 +1,7 @@
 locals {
   // Name of the homework mapped to published status
   published = {
-    hw0           = false
+    hw0           = true
     hw1           = false
     hw2           = false
     hw3           = false
@@ -16,8 +16,8 @@ locals {
       }
     ]
   ])
-  bot_user         = "cis188bot"
-  k8s_cluster_name = "cis188"
+  bot_user         = "cis1912bot"
+  k8s_cluster_name = "cis1912"
   users            = merge(var.students, var.instructors, var.tas)
   emails           = var.emails
 }

terraform/modules/hw_repo/main.tf

@@ -4,21 +4,27 @@ resource "github_repository" "hw" {
   visibility = "private"
 
   template {
-    owner      = "cis1880"
+    owner      = "cis1912"
     repository = var.hw
   }
 }
 
-resource "github_team_repository" "hw" {
+resource "github_repository_collaborators" "hw" {
   count      = var.published ? 1 : 0
-  team_id    = var.team-id
   repository = github_repository.hw[0].name
-  permission = var.hw != "hw4" ? "push" : "admin"
-}
 
-resource "github_team_repository" "bot" {
-  count      = var.published ? 1 : 0
-  team_id    = var.bot-team-id
-  repository = github_repository.hw[0].name
-  permission = "admin"
+  user {
+    permission = "admin"
+    username   = "cis1912bot"
+  }
+
+  team {
+    permission = var.hw != "hw4" ? "push" : "admin"
+    team_id    = var.team-id
+  }
+
+  user {
+    permission = "push"
+    username   = var.github-username
+  }
 }

terraform/modules/hw_repo/variables.tf

@@ -3,6 +3,11 @@ variable "pennkey" {
   description = "Pennkey of student"
 }
 
+variable "github-username" {
+  type        = string
+  description = "GitHub username of student"
+}
+
 variable "hw" {
   type        = string
   description = "Homework to create repo of (Ex. hw0)."

terraform/provider.tf

@@ -20,7 +20,6 @@ provider "helm" {
 # }
 
 provider "github" {
-  owner = "cis1880"
 }
 
 terraform {
@@ -39,7 +38,7 @@ terraform {
     # }
     github = {
       source  = "integrations/github"
-      version = "~> 6.0"
+      version = "~> 6.2.3"
     }
   }
 }

terraform/variables.tf

@@ -18,14 +18,19 @@ variable "image_pull_pat" {
   description = "PAT of GH User to pull gcr images"
 }
 
+variable "GH_TOKEN" {
+  type        = string
+  description = "GitHub Token for the cis1912 GitHub Application"
+}
+
 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" {