From a569f196620e75ecb199c21f03c02bb33f0efcfd Mon Sep 17 00:00:00 2001
From: Alexander Kyimpopkin <39439486+alxkp@users.noreply.github.com>
Date: Mon, 6 Feb 2023 15:54:26 -0500
Subject: [PATCH 1/4] first step of updating eks from v1.21 to v1.22

---
 cdk/kittyhawk/src/imports/k8s.ts | 82 ++++++++++++++++----------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/cdk/kittyhawk/src/imports/k8s.ts b/cdk/kittyhawk/src/imports/k8s.ts
index 6acb1f05..00696131 100644
--- a/cdk/kittyhawk/src/imports/k8s.ts
+++ b/cdk/kittyhawk/src/imports/k8s.ts
@@ -228,7 +228,7 @@ export class KubeMutatingWebhookConfigurationV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.admissionregistration.v1beta1.MutatingWebhookConfiguration"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'admissionregistration.k8s.io/v1beta1',
+    apiVersion: 'admissionregistration.k8s.io/v1',
     kind: 'MutatingWebhookConfiguration',
   }
 
@@ -282,7 +282,7 @@ export class KubeMutatingWebhookConfigurationListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.admissionregistration.v1beta1.MutatingWebhookConfigurationList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'admissionregistration.k8s.io/v1beta1',
+    apiVersion: 'admissionregistration.k8s.io/v1',
     kind: 'MutatingWebhookConfigurationList',
   }
 
@@ -336,7 +336,7 @@ export class KubeValidatingWebhookConfigurationV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.admissionregistration.v1beta1.ValidatingWebhookConfiguration"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'admissionregistration.k8s.io/v1beta1',
+    apiVersion: 'admissionregistration.k8s.io/v1',
     kind: 'ValidatingWebhookConfiguration',
   }
 
@@ -390,7 +390,7 @@ export class KubeValidatingWebhookConfigurationListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.admissionregistration.v1beta1.ValidatingWebhookConfigurationList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'admissionregistration.k8s.io/v1beta1',
+    apiVersion: 'admissionregistration.k8s.io/v1',
     kind: 'ValidatingWebhookConfigurationList',
   }
 
@@ -1204,7 +1204,7 @@ export class KubeTokenReviewV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.authentication.v1beta1.TokenReview"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'authentication.k8s.io/v1beta1',
+    apiVersion: 'authentication.k8s.io/v1',
     kind: 'TokenReview',
   }
 
@@ -1474,7 +1474,7 @@ export class KubeLocalSubjectAccessReviewV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.authorization.v1beta1.LocalSubjectAccessReview"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'authorization.k8s.io/v1beta1',
+    apiVersion: 'authorization.k8s.io/v1',
     kind: 'LocalSubjectAccessReview',
   }
 
@@ -1528,7 +1528,7 @@ export class KubeSelfSubjectAccessReviewV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.authorization.v1beta1.SelfSubjectAccessReview"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'authorization.k8s.io/v1beta1',
+    apiVersion: 'authorization.k8s.io/v1',
     kind: 'SelfSubjectAccessReview',
   }
 
@@ -1582,7 +1582,7 @@ export class KubeSelfSubjectRulesReviewV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.authorization.v1beta1.SelfSubjectRulesReview"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'authorization.k8s.io/v1beta1',
+    apiVersion: 'authorization.k8s.io/v1',
     kind: 'SelfSubjectRulesReview',
   }
 
@@ -1636,7 +1636,7 @@ export class KubeSubjectAccessReviewV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.authorization.v1beta1.SubjectAccessReview"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'authorization.k8s.io/v1beta1',
+    apiVersion: 'authorization.k8s.io/v1',
     kind: 'SubjectAccessReview',
   }
 
@@ -2506,7 +2506,7 @@ export class KubeCertificateSigningRequestV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.certificates.v1beta1.CertificateSigningRequest"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'certificates.k8s.io/v1beta1',
+    apiVersion: 'certificates.k8s.io/v1',
     kind: 'CertificateSigningRequest',
   }
 
@@ -2560,7 +2560,7 @@ export class KubeCertificateSigningRequestListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.certificates.v1beta1.CertificateSigningRequestList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'certificates.k8s.io/v1beta1',
+    apiVersion: 'certificates.k8s.io/v1',
     kind: 'CertificateSigningRequestList',
   }
 
@@ -2722,7 +2722,7 @@ export class KubeLeaseV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.coordination.v1beta1.Lease"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'coordination.k8s.io/v1beta1',
+    apiVersion: 'coordination.k8s.io/v1',
     kind: 'Lease',
   }
 
@@ -2776,7 +2776,7 @@ export class KubeLeaseListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.coordination.v1beta1.LeaseList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'coordination.k8s.io/v1beta1',
+    apiVersion: 'coordination.k8s.io/v1',
     kind: 'LeaseList',
   }
 
@@ -5001,7 +5001,7 @@ export class KubeIngressV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.networking.v1beta1.Ingress"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'networking.k8s.io/v1beta1',
+    apiVersion: 'networking.k8s.io/v1',
     kind: 'Ingress',
   }
 
@@ -5055,7 +5055,7 @@ export class KubeIngressListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.networking.v1beta1.IngressList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'networking.k8s.io/v1beta1',
+    apiVersion: 'networking.k8s.io/v1',
     kind: 'IngressList',
   }
 
@@ -5649,7 +5649,7 @@ export class KubeIngressClassV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.networking.v1beta1.IngressClass"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'networking.k8s.io/v1beta1',
+    apiVersion: 'networking.k8s.io/v1',
     kind: 'IngressClass',
   }
 
@@ -5703,7 +5703,7 @@ export class KubeIngressClassListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.networking.v1beta1.IngressClassList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'networking.k8s.io/v1beta1',
+    apiVersion: 'networking.k8s.io/v1',
     kind: 'IngressClassList',
   }
 
@@ -7323,7 +7323,7 @@ export class KubeClusterRoleV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.rbac.v1beta1.ClusterRole"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'rbac.authorization.k8s.io/v1beta1',
+    apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'ClusterRole',
   }
 
@@ -7377,7 +7377,7 @@ export class KubeClusterRoleBindingV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.rbac.v1beta1.ClusterRoleBinding"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'rbac.authorization.k8s.io/v1beta1',
+    apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'ClusterRoleBinding',
   }
 
@@ -7431,7 +7431,7 @@ export class KubeClusterRoleBindingListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.rbac.v1beta1.ClusterRoleBindingList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'rbac.authorization.k8s.io/v1beta1',
+    apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'ClusterRoleBindingList',
   }
 
@@ -7485,7 +7485,7 @@ export class KubeClusterRoleListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.rbac.v1beta1.ClusterRoleList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'rbac.authorization.k8s.io/v1beta1',
+    apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'ClusterRoleList',
   }
 
@@ -7539,7 +7539,7 @@ export class KubeRoleV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.rbac.v1beta1.Role"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'rbac.authorization.k8s.io/v1beta1',
+    apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'Role',
   }
 
@@ -7593,7 +7593,7 @@ export class KubeRoleBindingV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.rbac.v1beta1.RoleBinding"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'rbac.authorization.k8s.io/v1beta1',
+    apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'RoleBinding',
   }
 
@@ -7647,7 +7647,7 @@ export class KubeRoleBindingListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.rbac.v1beta1.RoleBindingList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'rbac.authorization.k8s.io/v1beta1',
+    apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'RoleBindingList',
   }
 
@@ -7701,7 +7701,7 @@ export class KubeRoleListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.rbac.v1beta1.RoleList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'rbac.authorization.k8s.io/v1beta1',
+    apiVersion: 'rbac.authorization.k8s.io/v1',
     kind: 'RoleList',
   }
 
@@ -7971,7 +7971,7 @@ export class KubePriorityClassV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.scheduling.v1beta1.PriorityClass"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'scheduling.k8s.io/v1beta1',
+    apiVersion: 'scheduling.k8s.io/v1',
     kind: 'PriorityClass',
   }
 
@@ -8025,7 +8025,7 @@ export class KubePriorityClassListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.scheduling.v1beta1.PriorityClassList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'scheduling.k8s.io/v1beta1',
+    apiVersion: 'scheduling.k8s.io/v1',
     kind: 'PriorityClassList',
   }
 
@@ -8741,7 +8741,7 @@ export class KubeCsiDriverV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.storage.v1beta1.CSIDriver"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'storage.k8s.io/v1beta1',
+    apiVersion: 'storage.k8s.io/v1',
     kind: 'CSIDriver',
   }
 
@@ -8795,7 +8795,7 @@ export class KubeCsiDriverListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.storage.v1beta1.CSIDriverList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'storage.k8s.io/v1beta1',
+    apiVersion: 'storage.k8s.io/v1',
     kind: 'CSIDriverList',
   }
 
@@ -8849,7 +8849,7 @@ export class KubeCsiNodeV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.storage.v1beta1.CSINode"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'storage.k8s.io/v1beta1',
+    apiVersion: 'storage.k8s.io/v1',
     kind: 'CSINode',
   }
 
@@ -8903,7 +8903,7 @@ export class KubeCsiNodeListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.storage.v1beta1.CSINodeList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'storage.k8s.io/v1beta1',
+    apiVersion: 'storage.k8s.io/v1',
     kind: 'CSINodeList',
   }
 
@@ -8965,7 +8965,7 @@ export class KubeCsiStorageCapacityV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.storage.v1beta1.CSIStorageCapacity"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'storage.k8s.io/v1beta1',
+    apiVersion: 'storage.k8s.io/v1',
     kind: 'CSIStorageCapacity',
   }
 
@@ -9019,7 +9019,7 @@ export class KubeCsiStorageCapacityListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.storage.v1beta1.CSIStorageCapacityList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'storage.k8s.io/v1beta1',
+    apiVersion: 'storage.k8s.io/v1',
     kind: 'CSIStorageCapacityList',
   }
 
@@ -9075,7 +9075,7 @@ export class KubeStorageClassV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.storage.v1beta1.StorageClass"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'storage.k8s.io/v1beta1',
+    apiVersion: 'storage.k8s.io/v1',
     kind: 'StorageClass',
   }
 
@@ -9129,7 +9129,7 @@ export class KubeStorageClassListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.storage.v1beta1.StorageClassList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'storage.k8s.io/v1beta1',
+    apiVersion: 'storage.k8s.io/v1',
     kind: 'StorageClassList',
   }
 
@@ -9185,7 +9185,7 @@ export class KubeVolumeAttachmentV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.storage.v1beta1.VolumeAttachment"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'storage.k8s.io/v1beta1',
+    apiVersion: 'storage.k8s.io/v1',
     kind: 'VolumeAttachment',
   }
 
@@ -9239,7 +9239,7 @@ export class KubeVolumeAttachmentListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.api.storage.v1beta1.VolumeAttachmentList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'storage.k8s.io/v1beta1',
+    apiVersion: 'storage.k8s.io/v1',
     kind: 'VolumeAttachmentList',
   }
 
@@ -9401,7 +9401,7 @@ export class KubeCustomResourceDefinitionV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceDefinition"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'apiextensions.k8s.io/v1beta1',
+    apiVersion: 'apiextensions.k8s.io/v1',
     kind: 'CustomResourceDefinition',
   }
 
@@ -9455,7 +9455,7 @@ export class KubeCustomResourceDefinitionListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.CustomResourceDefinitionList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'apiextensions.k8s.io/v1beta1',
+    apiVersion: 'apiextensions.k8s.io/v1',
     kind: 'CustomResourceDefinitionList',
   }
 
@@ -9671,7 +9671,7 @@ export class KubeApiServiceV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.kube-aggregator.pkg.apis.apiregistration.v1beta1.APIService"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'apiregistration.k8s.io/v1beta1',
+    apiVersion: 'apiregistration.k8s.io/v1',
     kind: 'APIService',
   }
 
@@ -9725,7 +9725,7 @@ export class KubeApiServiceListV1Beta1 extends ApiObject {
    * Returns the apiVersion and kind for "io.k8s.kube-aggregator.pkg.apis.apiregistration.v1beta1.APIServiceList"
    */
   public static readonly GVK: GroupVersionKind = {
-    apiVersion: 'apiregistration.k8s.io/v1beta1',
+    apiVersion: 'apiregistration.k8s.io/v1',
     kind: 'APIServiceList',
   }
 

From 2a96bbecfef36c090b98013cfef69f65757a1e45 Mon Sep 17 00:00:00 2001
From: Joy Liu <joyliu.q@gmail.com>
Date: Mon, 6 Feb 2023 16:06:05 -0500
Subject: [PATCH 2/4] :arrow_up: Bump version to 1.1.7

---
 cdk/kittyhawk/.projenrc.js | 2 +-
 cdk/kittyhawk/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cdk/kittyhawk/.projenrc.js b/cdk/kittyhawk/.projenrc.js
index bbe36081..ea258158 100644
--- a/cdk/kittyhawk/.projenrc.js
+++ b/cdk/kittyhawk/.projenrc.js
@@ -15,7 +15,7 @@ const project = new TypeScriptProject({
   },
 });
 
-project.addFields({['version']: '1.1.4'});
+project.addFields({['version']: '1.1.7'});
 project.prettier?.ignoreFile?.addPatterns('src/imports');
 project.testTask.steps.forEach(step => {
   if (step.exec) {
diff --git a/cdk/kittyhawk/package.json b/cdk/kittyhawk/package.json
index ba1fd5fc..d7c63324 100644
--- a/cdk/kittyhawk/package.json
+++ b/cdk/kittyhawk/package.json
@@ -65,7 +65,7 @@
   "main": "lib/index.js",
   "license": "MIT",
   "homepage": "https://kittyhawk.pennlabs.org",
-  "version": "1.1.4",
+  "version": "1.1.7",
   "jest": {
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.ts?(x)",

From 0415c037d6b883c870380f60f1563c5f4255082c Mon Sep 17 00:00:00 2001
From: Joy Liu <joyliu.q@gmail.com>
Date: Tue, 7 Feb 2023 02:14:42 -0500
Subject: [PATCH 3/4] :tada: Add OHQ wsgi + asgi ingresses

---
 .../helm/office-hours-queue-django-asgi.yaml  | 20 +++++++++++++++++++
 .../helm/office-hours-queue-django-wsgi.yaml  | 20 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 terraform/helm/office-hours-queue-django-asgi.yaml
 create mode 100644 terraform/helm/office-hours-queue-django-wsgi.yaml

diff --git a/terraform/helm/office-hours-queue-django-asgi.yaml b/terraform/helm/office-hours-queue-django-asgi.yaml
new file mode 100644
index 00000000..fee4d663
--- /dev/null
+++ b/terraform/helm/office-hours-queue-django-asgi.yaml
@@ -0,0 +1,20 @@
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  annotations:
+  name: office-hours-queue-django-asgi
+  namespace: default
+spec:
+  entryPoints:
+  - websecure
+  routes:
+  - kind: Rule
+    match: Host(`ohq.io`) && PathPrefix(`/`)
+    services:
+    - kind: Service
+      name: office-hours-queue-django-asgi
+      namespace: default
+      passHostHeader: true
+      port: 80
+  tls:
+    secretName: ohq-io-tls
\ No newline at end of file
diff --git a/terraform/helm/office-hours-queue-django-wsgi.yaml b/terraform/helm/office-hours-queue-django-wsgi.yaml
new file mode 100644
index 00000000..7bcb8fc8
--- /dev/null
+++ b/terraform/helm/office-hours-queue-django-wsgi.yaml
@@ -0,0 +1,20 @@
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  annotations:
+  name: office-hours-queue-django-wsgi
+  namespace: default
+spec:
+  entryPoints:
+  - websecure
+  routes:
+  - kind: Rule
+    match: Host(`ohq.io`) && PathPrefix(`/`)
+    services:
+    - kind: Service
+      name: office-hours-queue-django-wsgi
+      namespace: default
+      passHostHeader: true
+      port: 80
+  tls:
+    secretName: ohq-io-tls
\ No newline at end of file

From b656bcb040694003b478753492bebe9ad89c3a94 Mon Sep 17 00:00:00 2001
From: Joy Liu <joyliu.q@gmail.com>
Date: Tue, 7 Feb 2023 17:21:25 -0500
Subject: [PATCH 4/4] :tada: Add Hub@Penn + Penn Clubs Django Asgi

---
 .../helm/office-hours-queue-django-asgi.yaml  |  2 +-
 .../helm/office-hours-queue-django-wsgi.yaml  |  2 +-
 terraform/helm/penn-clubs-django-asgi.yaml    | 21 +++++++++++++++++++
 .../helm/penn-clubs-hub-django-asgi.yaml      | 21 +++++++++++++++++++
 .../helm/penn-clubs-hub-django-wsgi.yaml      | 20 ++++++++++++++++++
 5 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 terraform/helm/penn-clubs-django-asgi.yaml
 create mode 100644 terraform/helm/penn-clubs-hub-django-asgi.yaml
 create mode 100644 terraform/helm/penn-clubs-hub-django-wsgi.yaml

diff --git a/terraform/helm/office-hours-queue-django-asgi.yaml b/terraform/helm/office-hours-queue-django-asgi.yaml
index fee4d663..efb0df4c 100644
--- a/terraform/helm/office-hours-queue-django-asgi.yaml
+++ b/terraform/helm/office-hours-queue-django-asgi.yaml
@@ -9,7 +9,7 @@ spec:
   - websecure
   routes:
   - kind: Rule
-    match: Host(`ohq.io`) && PathPrefix(`/`)
+    match: Host(`ohq.io`) && PathPrefix(`/api/ws`)
     services:
     - kind: Service
       name: office-hours-queue-django-asgi
diff --git a/terraform/helm/office-hours-queue-django-wsgi.yaml b/terraform/helm/office-hours-queue-django-wsgi.yaml
index 7bcb8fc8..35cd338b 100644
--- a/terraform/helm/office-hours-queue-django-wsgi.yaml
+++ b/terraform/helm/office-hours-queue-django-wsgi.yaml
@@ -9,7 +9,7 @@ spec:
   - websecure
   routes:
   - kind: Rule
-    match: Host(`ohq.io`) && PathPrefix(`/`)
+    match: (Host(`ohq.io`) && PathPrefix(`/admin`)) || (Host(`ohq.io`) && PathPrefix(`/api`)) || (Host(`ohq.io`) && PathPrefix(`/assets`))
     services:
     - kind: Service
       name: office-hours-queue-django-wsgi
diff --git a/terraform/helm/penn-clubs-django-asgi.yaml b/terraform/helm/penn-clubs-django-asgi.yaml
new file mode 100644
index 00000000..2dd244db
--- /dev/null
+++ b/terraform/helm/penn-clubs-django-asgi.yaml
@@ -0,0 +1,21 @@
+apiVersion: traefik.containo.us/v1alpha1    
+kind: IngressRoute  
+metadata:   
+  annotations: 
+  name: penn-clubs-django-asgi      
+  namespace: default
+spec:       
+  entryPoints:
+  - websecure       
+  routes:   
+  - kind: Rule      
+    match: Host(`pennclubs.com`) && PathPrefix(`/api/ws`)  
+    middlewares:    
+    - name: ws-middleware
+    services:       
+    - kind: Service 
+      name: penn-clubs-django-asgi  
+      namespace: default
+      port: 80      
+  tls:      
+    secretName: pennclubs-com-tls
\ No newline at end of file
diff --git a/terraform/helm/penn-clubs-hub-django-asgi.yaml b/terraform/helm/penn-clubs-hub-django-asgi.yaml
new file mode 100644
index 00000000..55c93a42
--- /dev/null
+++ b/terraform/helm/penn-clubs-hub-django-asgi.yaml
@@ -0,0 +1,21 @@
+apiVersion: traefik.containo.us/v1alpha1    
+kind: IngressRoute  
+metadata:   
+  annotations: 
+  name: penn-clubs-hub-django-asgi      
+  namespace: default
+spec:       
+  entryPoints:      
+  - websecure       
+  routes:   
+  - kind: Rule      
+    match: Host(`hub.provost.upenn.edu`) && PathPrefix(`/api/ws`)  
+    middlewares:    
+    - name: ws-middleware
+    services:       
+    - kind: Service 
+      name: penn-clubs-hub-django-asgi  
+      namespace: default
+      port: 80      
+  tls:      
+    secretName: hub-provost-upenn-edu-tls
\ No newline at end of file
diff --git a/terraform/helm/penn-clubs-hub-django-wsgi.yaml b/terraform/helm/penn-clubs-hub-django-wsgi.yaml
new file mode 100644
index 00000000..e60dae74
--- /dev/null
+++ b/terraform/helm/penn-clubs-hub-django-wsgi.yaml
@@ -0,0 +1,20 @@
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  annotations:
+  name: penn-clubs-hub-django-wsgi
+  namespace: default
+spec:
+  entryPoints:
+  - websecure
+  routes:
+  - kind: Rule
+    match: Host(`hub.provost.upenn.edu`) && PathPrefix(`/api`))
+    services:
+    - kind: Service
+      name: penn-clubs-hub-django-wsgi
+      namespace: default
+      passHostHeader: true
+      port: 80
+  tls:
+    secretName: hub-provost-upenn-edu-tls
\ No newline at end of file