Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1880 ➡️ 1912 #11

Merged
merged 2 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions terraform/cert-manager-files/cert.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions terraform/helm/grafana.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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"
10 changes: 5 additions & 5 deletions terraform/main.tf
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
}
2 changes: 1 addition & 1 deletion terraform/modules/hw_repo/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ resource "github_repository" "hw" {
visibility = "private"

template {
owner = "cis1880"
owner = "cis1912"
repository = var.hw
}
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ provider "kubernetes" {
}

provider "github" {
organization = "cis1880"
organization = "cis1912"
}

terraform {
Expand Down
4 changes: 2 additions & 2 deletions terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
Loading