Merge branch 'master' into develop

Author: pierreTklein

.gitignore

@@ -62,4 +62,7 @@ node_modules
 gcp_creds.json
 
 #certbot 
-certbot/
+certbot/
+
+#secrets
+secret.yaml

Dockerfile

@@ -7,6 +7,9 @@ WORKDIR /usr/src/app
 COPY package*.json ./
 ADD VERSION .
 
+RUN npm install -g n
+RUN n 9.9.0
+RUN npm install npm -g
 RUN npm install
 
 COPY . .

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,38 @@
+# Description
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Fixes # (issue)
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+# How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+
+- [ ] Test A
+- [ ] Test B
+
+**Test Configuration**:
+* Firmware version:
+* Hardware:
+* Toolchain:
+* SDK:
+
+# Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] New and existing unit tests pass locally with my changes
+- [ ] Any dependent changes have been merged and published in downstream modules

VERSION

@@ -1 +1 @@
-0.1.1
+1.0.3

app.js

@@ -35,10 +35,16 @@ Services.db.connect(app);
 let corsOptions = {};
 
 if (!Services.env.isProduction()) {
-    corsOptions = { origin: ["http://localhost:1337", "http://localhost:8989"], credentials: true };
+    corsOptions = {
+        origin: ["http://localhost:1337", "http://localhost:8989"],
+        credentials: true
+    };
 } else {
     // TODO: change this when necessary
-    corsOptions = { origin: ["https://mchacks.ca/"], credentials: true };
+    corsOptions = {
+        origin: ["https://mchacks.ca/"],
+        credentials: true
+    };
 }
 
 app.use(cors(corsOptions));
@@ -79,6 +85,7 @@ searchRouter.activate(apiRouter);
 Services.log.info("Search router activated");
 
 apiRouter.use("/", indexRouter);
+app.use("/", indexRouter);
 
 app.use("/api", apiRouter);
 

deployment.yaml

@@ -0,0 +1,24 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: hackboard
+spec:
+  selector:
+    matchLabels:
+      run: hackboard
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        run: hackboard
+    spec:
+      volumes:
+      - name: secret-volume
+        secret:
+          secretName: hackboard-secret
+      containers:
+      - name: hackboard
+        image: gcr.io/mchacks-api/hackboard:1.0.2
+        ports:
+        # - containerPort: 443
+        - containerPort: 8080

ingress.yaml

@@ -0,0 +1,16 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: hackboard-ingress
+  annotations:
+    kubernetes.io/ingress.global-static-ip-name: hackboard-ingress-static-ip
+spec:
+  # tls:
+  # - secretName: hackboard-secret
+  # rules:
+  # - http:
+  #     paths:
+  #     - path: /*
+  backend:
+    serviceName: hackboard-service
+    servicePort: 80

service.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: hackboard-service
+  labels:
+    run: hackboard # because that's the label on the deployment (not sure what labels do tho)
+  # annotations:
+  #   cloud.google.com/app-protocols: '{"hackboard-https-port":"HTTPS","hackboard-http-port":"HTTP"}'
+spec:
+  selector: 
+    run: hackboard # because that's the selector on the deployment (not sure what labels do tho)
+  ports:
+    - name: http #hackboard-http-port
+      protocol: TCP
+      port: 80
+      targetPort: 8080 # because the deployment port is 80/TCP
+    # - name: hackboard-https-port
+    #   protocol: TCP
+    #   port: 443
+  type: LoadBalancer
+
+# endpoint of service same as ip of pods -> means communication between service and pod (direction?)
+# can talk to this service with cluster-ip:port from any other node on cluster