Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/cis188/infrastructure int…
Browse files Browse the repository at this point in the history
…o joy/nuke-and-pave-tf
  • Loading branch information
joyliu-q committed Sep 10, 2024
2 parents 382b9f8 + cade080 commit 5d673af
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# infrastructure

This repo contains the underlying infrastructure of CIS 188. Feel free to poke around! If you want to learn more about how anything is configured just ask.
This repo contains the underlying infrastructure of CIS 1912. Feel free to poke around! If you want to learn more about how anything is configured just ask.

## Beginning of semester configuration

Expand Down
2 changes: 1 addition & 1 deletion terraform/cert-manager-files/clusterissuer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
acme:
server: https://acme-v02.api.letsencrypt.org/directory
email: cis188[email protected]
email: cis1912[email protected]
privateKeySecretRef:
name: letsencrypt
solvers:
Expand Down
8 changes: 4 additions & 4 deletions terraform/eks.tf
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,17 @@
# namespace = "kube-system"
# }

# data = {
# ".dockerconfigjson" = <<DOCKER
# data = {
# ".dockerconfigjson" = <<DOCKER
# {
# "auths": {
# "https://ghcr.io": {
# "auth": "${base64encode("cis188bot:${var.image_pull_pat}")}"
# "auth": "${base64encode("cis1912bot:${var.image_pull_pat}")}"
# }
# }
# }
# DOCKER
# }
# }

# type = "kubernetes.io/dockerconfigjson"
# }
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/hw_repo/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# hw_repo

If published is set to `true`, this module creates a homework repository for a given pennkey, gives that student push access to the repo (through their team) and gives the 188 bot user admin access to the repo.
If published is set to `true`, this module creates a homework repository for a given pennkey, gives that student push access to the repo (through their team) and gives the 1912 bot user admin access to the repo.
4 changes: 2 additions & 2 deletions terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ variable "GH_TOKEN" {

variable "GF_GH_CLIENT_ID" {
type = string
description = "GitHub Client ID for the cis1912 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 cis1912 Grafana OAuth2 Application"
description = "GitHub Client Secret for the CIS1912 Grafana OAuth2 Application"
}

variable "emails" {
Expand Down

0 comments on commit 5d673af

Please sign in to comment.