Skip to content

Commit 0bac7d2

Browse files
committed
containerization fully functional
1 parent afdeb0b commit 0bac7d2

File tree

5 files changed

+35
-15
lines changed

5 files changed

+35
-15
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules
22
package-lock.json
3+
klustr-316321-f31f9767f260.json

Dockerfile

+23-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# ohana app image
12
FROM node:latest AS app
23
WORKDIR /
34
COPY package*.json ./
@@ -6,17 +7,35 @@ COPY . .
67
EXPOSE 8080
78
ENTRYPOINT ["node", "./server/server.js"]
89

10+
## Installs gcloud and kubectl as well as other products
911
FROM gcr.io/google.com/cloudsdktool/cloud-sdk:latest as gcloud
1012
WORKDIR /
1113

12-
# FROM kiwigrid/gcloud-kubectl-helm:latest as gcloud
13-
# WORKDIR /
14-
# COPY . .
15-
14+
## Install debian as OS for container
1615
FROM debian:latest as os
1716
WORKDIR /
1817
COPY --from=app / .
1918
COPY --from=gcloud / .
2019
RUN apt-get update
20+
RUN apt-get install sudo
2121
# RUN apt-get install vim
22+
# authenticate gcloud service account via json token
23+
RUN gcloud auth activate-service-account [email protected] --key-file=/secret/klustr-316321-f31f9767f260.json
24+
RUN gcloud config set project klustr-316321
25+
RUN sudo apt-get install kubectl
26+
# generate kubectl config file via gcloud cli (note 'cluster-1' is cluster name to be replaced)
27+
RUN gcloud container clusters get-credentials cluster-1 --zone=us-west1-a
28+
29+
## run sequential commands to install helm
30+
RUN curl https://baltocdn.com/helm/signing.asc | sudo apt-key add -
31+
RUN sudo apt-get install apt-transport-https --yes
32+
RUN echo "deb https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list
33+
RUN sudo apt-get update
34+
RUN sudo apt-get install helm
35+
36+
# install vCluster
37+
RUN curl -s -L "https://github.com/loft-sh/vcluster/releases/latest" | sed -nE 's!.*"([^"]*vcluster-linux-amd64)".*!https://github.com\1!p' | xargs -n 1 curl -L -o vcluster && chmod +x vcluster;
38+
RUN sudo mv vcluster /usr/local/bin;
39+
40+
# spin up webpack dev server
2241
CMD npm run dev

server/controllers/spacesController.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ const spacesController = {};
55
//will need to edit the database schema
66

77
spacesController.addNamespace = (req, res, next) => {
8-
const { clusterName, hostNamespace, team_id, projectName } = req.body;
9-
const params = [clusterName, hostNamespace, team_id, projectName];
8+
const { clusterName, team_id, projectName } = req.body;
9+
const params = [clusterName, team_id, projectName];
1010
const query = `
11-
INSERT INTO namespaces3(cluster, name, team_id, project)
12-
VALUES ($1, $2, $3, $4)`
11+
INSERT INTO namespaces5(name, team_id, project)
12+
VALUES ($1, $2, $3)`
1313

1414
db.query(query, params)
1515
.then(() => {
@@ -39,7 +39,7 @@ spacesController.addNamespace = (req, res, next) => {
3939
spacesController.fetchNamespaces = (req, res, next) => {
4040
// console.group(req.params)
4141
const query = `
42-
SELECT * FROM namespaces3`
42+
SELECT * FROM namespaces5`
4343
db.query(query)
4444
.then((data) => {
4545
res.locals.kyung = data.rows;
@@ -92,7 +92,7 @@ spacesController.getExternalIp = (req, res, next) => {
9292

9393
spacesController.fetchSpaces = (req, res, next) => {
9494
const query = `
95-
SELECT * FROM namespaces2;
95+
SELECT * FROM namespaces5;
9696
`
9797

9898
db.query(query)

server/controllers/userController.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ userController.addNewUser = (req, res, next) => {
3232
const { email, firstName, lastName, teamId, isAdmin } = req.body;
3333
const params = [email, password, firstName, lastName, teamId, isAdmin];
3434
const query = `
35-
INSERT INTO users(email, password, first_name, last_name, team_id, is_admin)
35+
INSERT INTO users5(email, password, first_name, last_name, team_id, is_admin)
3636
VALUES ($1, $2, $3, $4, $5, $6);`
3737
db.query(query, params)
3838
.then(() => next())
@@ -45,7 +45,7 @@ userController.loginCheck = (req, res, next) => {
4545
const { email, password } = req.body;
4646
const query = `
4747
SELECT password
48-
FROM users
48+
FROM users5
4949
WHERE email = '${email}'
5050
`
5151
db.query(query)
@@ -64,7 +64,7 @@ userController.isAdminCheck = (req, res, next) => {
6464
const params = [email];
6565
const query = `
6666
SELECT is_admin
67-
FROM users
67+
FROM users5
6868
WHERE email=$1;
6969
`
7070
db.query(query, params)

server/controllers/vClusterController.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ vClusterController.addVCluster = (req, res, next) => {
77
const { hostNamespace, vClusterName, projectName } = req.body;
88
const params = [hostNamespace, vClusterName, projectName];
99
const query = `
10-
INSERT INTO vclusters3(team_id, namespace_id, project)
10+
INSERT INTO vclusters5(hostNamespace, vClusterName, project)
1111
VALUES ($1, $2, $3)`
1212
db.query(query, params)
1313
.then(() => {
@@ -64,7 +64,7 @@ vClusterController.deleteVCluster = (req, res, next) => {
6464

6565
vClusterController.fetchVClusters = (req, res, next) => {
6666
const query = `
67-
SELECT * FROM vclusters3;
67+
SELECT * FROM vclusters5;
6868
`
6969
db.query(query)
7070
.then((data) => {

0 commit comments

Comments
 (0)