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

AWS EKS 배포 시 수정사항 #61

Merged
merged 6 commits into from
Aug 20, 2023
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
23 changes: 23 additions & 0 deletions resources/images/control-ubuntu/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
SSH_PASSWORD=qwer123!
WEBSSH_BRANCH=nkeum-dev
WEBSSH_PORT=8886

SERVER_PORT=8003
SERVER_HOST=0.0.0.0

STUDENT_SERVER_PORT=8001
STUDENT_SVC=student-ubuntu-svc
STUDENT_NS=student-ns

KUBE_BASE_URL=http://a4916313160c74414a3426e5d3b9866c-383499736.ap-northeast-2.elb.amazonaws.com
BASE_URL=http://moaroom-back.duckdns.org:8080
STUDENT_BASE_URL=http://${STUDENT_SVC}.${STUDENT_NS}.svc.cluster.local:${STUDENT_SERVER_PORT}

DIR_PATH_STUDENT=/root/assignment
DIR_PATH_PROFESSOR=/root/assignment

APISERVER=https://kubernetes.default.svc # Point to the internal API server hostname
SERVICEACCOUNT=/var/run/secrets/kubernetes.io/serviceaccount # Path to ServiceAccount token
NAMESPACE=$(cat ${SERVICEACCOUNT}/namespace) # Read this Pod's namespace
TOKEN=$(cat ${SERVICEACCOUNT}/token) # Read the ServiceAccount bearer token
CACERT=${SERVICEACCOUNT}/ca.crt # Reference the internal certificate authority (CA)
2 changes: 1 addition & 1 deletion resources/images/control-ubuntu/server/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# CORS
origins = [
"http://localhost:3000",
"http://moaroom-front.duckdns.org:3000",
"http://moaroom-back.duckdns.org:8080",
]

Expand Down
23 changes: 23 additions & 0 deletions resources/images/professor-ubuntu/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
SSH_PASSWORD=qwer123!
WEBSSH_BRANCH=nkeum-dev
WEBSSH_PORT=8888

SERVER_PORT=8001
SERVER_HOST=0.0.0.0

STUDENT_SERVER_PORT=8001
STUDENT_SVC=student-ubuntu-svc
STUDENT_NS=student-ns

KUBE_BASE_URL=http://a4916313160c74414a3426e5d3b9866c-383499736.ap-northeast-2.elb.amazonaws.com
BASE_URL=http://moaroom-back.duckdns.org:8080
STUDENT_BASE_URL=http://${STUDENT_SVC}.${STUDENT_NS}.svc.cluster.local:${STUDENT_SERVER_PORT}

DIR_PATH_STUDENT=/root/assignment
DIR_PATH_PROFESSOR=/root/assignment

APISERVER=https://kubernetes.default.svc # Point to the internal API server hostname
SERVICEACCOUNT=/var/run/secrets/kubernetes.io/serviceaccount # Path to ServiceAccount token
NAMESPACE=$(cat ${SERVICEACCOUNT}/namespace) # Read this Pod's namespace
TOKEN=$(cat ${SERVICEACCOUNT}/token) # Read the ServiceAccount bearer token
CACERT=${SERVICEACCOUNT}/ca.crt # Reference the internal certificate authority (CA)
2 changes: 1 addition & 1 deletion resources/images/professor-ubuntu/server/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# CORS
origins = [
"http://localhost:3000",
"http://moaroom-front.duckdns.org:3000",
"http://moaroom-back.duckdns.org:8080",
]

Expand Down
23 changes: 23 additions & 0 deletions resources/images/student-ubuntu/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
SSH_PASSWORD=qwer123!
WEBSSH_BRANCH=nkeum-dev
WEBSSH_PORT=8888

SERVER_PORT=8001
SERVER_HOST=0.0.0.0

STUDENT_SERVER_PORT=8001
STUDENT_SVC=student-ubuntu-svc
STUDENT_NS=student-ns

KUBE_BASE_URL=http://a4916313160c74414a3426e5d3b9866c-383499736.ap-northeast-2.elb.amazonaws.com
BASE_URL=http://moaroom-back.duckdns.org:8080
STUDENT_BASE_URL=http://${STUDENT_SVC}.${STUDENT_NS}.svc.cluster.local:${STUDENT_SERVER_PORT}

DIR_PATH_STUDENT=/root/assignment
DIR_PATH_PROFESSOR=/root/assignment

APISERVER=https://kubernetes.default.svc # Point to the internal API server hostname
SERVICEACCOUNT=/var/run/secrets/kubernetes.io/serviceaccount # Path to ServiceAccount token
NAMESPACE=$(cat ${SERVICEACCOUNT}/namespace) # Read this Pod's namespace
TOKEN=$(cat ${SERVICEACCOUNT}/token) # Read the ServiceAccount bearer token
CACERT=${SERVICEACCOUNT}/ca.crt # Reference the internal certificate authority (CA)
2 changes: 1 addition & 1 deletion resources/images/student-ubuntu/server/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

# CORS
origins = [
"http://localhost:3000",
"http://moaroom-front.duckdns.org:3000",
"http://moaroom-back.duckdns.org:8080",
]

Expand Down
2 changes: 1 addition & 1 deletion resources/res/.env
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ STUDENT_SERVER_PORT=8001
STUDENT_SVC=student-ubuntu-svc
STUDENT_NS=student-ns

KUBE_BASE_URL=http://59.15.113.146 # 8080
KUBE_BASE_URL=http://a4916313160c74414a3426e5d3b9866c-383499736.ap-northeast-2.elb.amazonaws.com # 8080
BASE_URL=http://moaroom-back.duckdns.org:8080
STUDENT_BASE_URL=http://${STUDENT_SVC}.${STUDENT_NS}.svc.cluster.local:${STUDENT_SERVER_PORT}

Expand Down
2 changes: 1 addition & 1 deletion resources/yamls/deploy-control-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ metadata:
spec:
containers:
- name: control-ubuntu
image: control-ubuntu:3.2
image: ryann3/control-ubuntu:4.0
ports:
- name: nginx-port
containerPort: 80
Expand Down
4 changes: 1 addition & 3 deletions resources/yamls/deploy-professor-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
spec:
containers:
- name: professor-ubuntu
image: professor-ubuntu:4.2
image: ryann3/professor-ubuntu:5.0
ports:
- name: nginx-port
containerPort: 80
Expand Down Expand Up @@ -39,5 +39,3 @@ spec:
selector:
app: professor-label
type: LoadBalancer
---

19 changes: 1 addition & 18 deletions resources/yamls/deploy-student-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
spec:
containers:
- name: student-ubuntu
image: student-ubuntu:4.2
image: ryann3/student-ubuntu:5.0
ports:
- name: nginx-port
containerPort: 80
Expand All @@ -19,13 +19,6 @@ spec:
- name: server-port
containerPort: 8001
resources: {}
# volumeMounts:
# - name: student-secret
# mountPath: /root/.ssh/keys
# volumes:
# - name: student-secret
# secret:
# secretName: student-credential
---
apiVersion: v1
kind: Service
Expand All @@ -46,13 +39,3 @@ spec:
selector:
app: student-label
type: LoadBalancer
---
# apiVersion: v1
# data:
# tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZRekNDQXl1Z0F3SUJBZ0lVZnZtbnFQaUs2L0dueGNJRjhMZmtCZktaOTZBd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0xURVZNQk1HQTFVRUNnd01aWGhoYlhCc1pTQkpibU11TVJRd0VnWURWUVFEREF0bGVHRnRjR3hsTG1OdgpiVEFlRncweU16QXpNekV3TlRReE16VmFGdzB5TkRBek16QXdOVFF4TXpWYU1ERXhFREFPQmdOVkJBTU1CM04wCmRXUmxiblF4RURBT0JnTlZCQW9NQjNOMGRXUmxiblF4Q3pBSkJnTlZCQVlUQWt0U01JSUNJakFOQmdrcWhraUcKOXcwQkFRRUZBQU9DQWc4QU1JSUNDZ0tDQWdFQXljc2FYOGpFS0hzeHQxWTJqTmZza0l3VVFlWHQySys2TVhiYwp3bXNMbW5pMVdlby81TDc2UDRkV0lNRy9ZbEdkYWNGS3ZlZ2x5cUFERFNyL0FnM29BWWJKcjZYNmJBQVVSQm4vClRJc3NpMzBiTVRWQVhxVmMzMHlnSXRSNDRkTGpiSUNrTzB0aHdCUGdKQWllY2NBM2dGdTdMUFBaQVBQZUw0akwKYUYxNHUwR3REVE0vMHpKcFFjWWw2TVczb1UrcS80NldTU25ZRWNIVy9HRXJiQVJTa1RuREc4a0FDUDU2VTRNawphT3FuN05Bd1IxMng1R2g3SjZUOE1zdFB0T0FCZDdZWTNHRVNUWmtvYTNxSEl2d2JSSWlqclo1dkhjRE5NRzN3CnAzWVFhRTIxbElOcUYzbDNWSWVBV2xXU2ZHdlcxUC9XZmdZeEhjVTRkM3BCOXdmZFY1VEdhQ3BuNHFLZDgxMkUKQ3NvRG5RQ3ovMXdqbTJvNkpvc2s0YmY3ZjZwYUlsTEVzanN5S09FVDhwTVorZHNJSGdTUGFJN20rLzRJSGhRSwphQ2ZOMm81SVhxZm5EOGVjSElPa0hKZ2l3U2dqQk05dVZwR25CMDFuZnFhbE9CSmVtV2R5U2xaaEV5Q1Z4emRnClVhdElzQjNPS3JLSXlRM2FkQWVBRWRxNmJKNXhxSm02eldYQittV3h1a3k2VFZTVGFFRjg2TUhXeHo3UG9aVnUKUFV5ZWxreXFTemlRdkhiN3JveDJPN3lwczBuN3Z1MUVqQmp1bXV5VjFFRHZ4QzhGZWl1MnpKT0RyRFlHOEJjNQovQXlaZDIwVkljcS8vWWp1NkJ1K2RrWTBkUTFkSzNBb1hsaVZUTFRIVWJrTTJxWEtyaS8rbUpyeFdkMkRjUTZiClhiWDl5ZjhDQXdFQUFhTlhNRlV3SHdZRFZSMGpCQmd3Rm9BVWplTG9iNGR2dXQvSFRNSTEzNzNvdXZtY3hsVXcKQ1FZRFZSMFRCQUl3QURBTEJnTlZIUThFQkFNQ0JQQXdHZ1lEVlIwUkJCTXdFWUlKYkc5allXeG9iM04waHdSLwpBQUFCTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElDQVFCOHZoN0o5RmRaNEtwa2h4ekZ3NXNtSit0ODkvOURGSk1nCmZTL3JMaDY2NGxoODYrNmNvK1NsWkVzb05ZQjFiUGMxU0MwRlZuWlB0UVpNTVNENXNvcGRsdHI0b0ZSUEdhSnEKbU1xdjdOSWw0Mm5nVHNsa2p4b21Ud1FONGxMdjVqZGMvN1l4VkllcjFGMzNJOXVtazJ6aGRoTkZOVVdyTVl2UwpKZ2hTWkxJRWdGb21ZUlJTbUxRajBFaER2cFlzbGhqMGJmTU5NbWU5cTBnak95UVhVVFJDTkxqWUIvdFBvRU9XCjRocTRrWTErK2NNUkY2UUM5Q3c2eG5kMENvd2VzMkZIcktOaWxEdnlYcG5xVmk4VFJ6YTdjWk5zd25vd09aOFAKNzVlM3JSZ04rSEZ5WXh1WCtEc0hCVW84dk1pa3dTWHBab1NUc2lISUVPOEVpcEZsc2NRZko5WFBvdjAwaHpTMgpNZzVVc3ZCZ3BRQUI3TUxqak1ndWFsT0JncEZ2S0FUOXh0OW5rRVRzNUpFR1NGRE5kNEs3WTNMZjhQbGtuSk5kCmxJc0tmS3luQWFCZHNkOVdqVlFRbkR1cDMrVWFLditJcFRCRFJoc29pN3EzS0xqL28rdHg2VDFJZWg3MjIwdysKSFN6eHFReGdjTSs3Y0I3SXc3ei9QMTVrMnQxTG1WRTBibTNHR1lqU2dSSjVWRm0yWEdkc2JuaVAwWXlOQjFNRgpTamsrNHJlTHNmS3FKWGZZZjBCbzhLNWUvZTNvN1N6TGs4dEs2Qk9paGVPZWZBYmNsVUVRc2JkQWlGUmh6NE56CjNwRFBLN211eTd1b1hvWnl5QkluZ0djbTlRa25XMGZ5WE5Nc1FtcGtiSVk2eVN0bWpieWNMUi9NbDNYaklKNnMKRHNYTGhPSkxsZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
# tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRd0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1Mwd2dna3BBZ0VBQW9JQ0FRREp5eHBmeU1Rb2V6RzMKVmphTTEreVFqQlJCNWUzWXI3b3hkdHpDYXd1YWVMVlo2ai9rdnZvL2gxWWd3YjlpVVoxcHdVcTk2Q1hLb0FNTgpLdjhDRGVnQmhzbXZwZnBzQUJSRUdmOU1peXlMZlJzeE5VQmVwVnpmVEtBaTFIamgwdU5zZ0tRN1MySEFFK0FrCkNKNXh3RGVBVzdzczg5a0E4OTR2aU10b1hYaTdRYTBOTXovVE1tbEJ4aVhveGJlaFQ2ci9qcFpKS2RnUndkYjgKWVN0c0JGS1JPY01ieVFBSS9ucFRneVJvNnFmczBEQkhYYkhrYUhzbnBQd3l5MCswNEFGM3RoamNZUkpObVNocgplb2NpL0J0RWlLT3RubThkd00wd2JmQ25kaEJvVGJXVWcyb1hlWGRVaDRCYVZaSjhhOWJVLzlaK0JqRWR4VGgzCmVrSDNCOTFYbE1ab0ttZmlvcDN6WFlRS3lnT2RBTFAvWENPYmFqb21peVRodC90L3Fsb2lVc1N5T3pJbzRSUHkKa3huNTJ3Z2VCSTlvanViNy9nZ2VGQXBvSjgzYWpraGVwK2NQeDV3Y2c2UWNtQ0xCS0NNRXoyNVdrYWNIVFdkKwpwcVU0RWw2WlozSktWbUVUSUpYSE4yQlJxMGl3SGM0cXNvakpEZHAwQjRBUjJycHNubkdvbWJyTlpjSDZaYkc2ClRMcE5WSk5vUVh6b3dkYkhQcytobFc0OVRKNldUS3BMT0pDOGR2dXVqSFk3dkttelNmdSs3VVNNR082YTdKWFUKUU8vRUx3VjZLN2JNazRPc05nYndGem44REpsM2JSVWh5ci85aU83b0c3NTJSalIxRFYwcmNDaGVXSlZNdE1kUgp1UXphcGNxdUwvNlltdkZaM1lOeERwdGR0ZjNKL3dJREFRQUJBb0lDQVFDUTVyc2xsTERtc0svZWlwWFpSU09tCkdEQmpzWXU5VVZKT09xQURLNExGaFhBVUJOV2ttRTV5VitoTTFWTnNjbGFxbmhYaGtGV3l6bnZpZE1GdzVETjUKQlNUR2NGVUdRSGhNL3E0SWROZWp3azVJWTRpNWJkem1xOHRCdDNpbUVCMG15S2tsdXRlU2FiTkZyTHE1eStFTwoxcy90VTV5N3htSUJtQ1VYNkNiTnNEZG5oeW1KcW1WU3ljcG0vN01Bcm9pSHdnZkF1YjloNE9OVGp5THpDWmVRCm1QMjFjZndJZVZPMXJESDA5S3RvcllZOWVOWkl3WTNOeGZjak1rTW1Dc1NEQmN1TVZGZ2tTSnB4c3laZXhORi8Kd081bnVhRG9xSTJ1L1FNVi9QMkRLR24vSHU2THRMa3ZoYTF4TUlsanRyd3BieHpDbWdlaTdQL0RLNU02by9jWApxaG5rcDVYYkFUblZGTy91R3VpS0xLYTkzRW1pSGg5ZHR6eCtDOEpuTTVEU3kwRVZhWEdqTVdtR2N5TzYwOEhYCjJBSHZNcjBNcE5VY1YrN01Na3ZDTm4wakhoYXN3WEtjZVNBcm5qOUhEYTdlUWFITzF2ZUMxUkozOEc3T1BQUTAKeW9BRTh5YnNXVHNaQXZJcFVsc25SVW0zVmxINVBJQ09tZFZ4UWF4MzRlMUhuMWsrR2x3dXhXUVRqNHV6dUE5ZQovWmM3MDlFWkE2K21KYkFIUHJHRHRkd0Q1Vk55bW80eFV1VGdFUFlTVEJBSGYrNVl5VUl0YUNGN3NuYkJWTjBjCnlsT1o2eVlPdTUzSndHb2VHRTZvZkRZazdrMytseXhTTUJlM0FaZitzc29RcUE1Sy80UDVpQ2JaRm1RTkYrR0sKdFNsMlNpMUpXWTFNZzAzK3lEWS9ZUUtDQVFFQTdLaFZqaHM0aGNFdHRWRkY3UXZ1ODlzRW1tUS85dHhXamNhSApRRGhxWUowaXZKdmZiQVJISWhQTHZkT05FVmxPUHp1SGpFdHhaRlpRZjFuS1AwQjJQSTdEeE9JcjhCVEl5aDNuCkdIbVdQQ0RkRHh0WHRvK1RkMW9VdnhmSnVVc2hkdW5aWWNmQS9PRzBWbjMwRkhjNkRrOHpCZjVBMlA3WTViSngKOXBuUkRZRlNnRDVXSVpwMElDNHFadEhBR2tramdTR1FRS09LemdLRUtDUFIxOVJWVHJqaUViTTFuNkZmUnBXYQplalJFUWVQWHlQV3orc1RGdDBTck84U1pMQ1RvSzRUV0ZOZ3o0VUttMXhoSWM2dkRzYlBUL0syZzNCdUV1VFdOCmQwQk0ycldLUnhjWFBSa2JEYldpbExQdGZDZm83c25QcDZDVmtEWlFrS1ZJczV2Qld3S0NBUUVBMmtsTE11ZWYKQ3N3b05sanJKUFNFMU0vZTBxM1plNVZkZjhMUFVKSWhTZDVpNVhPYmF2QkcvMzNnNnBabTZtSTRjZ3RuQzNaYgpuSWtWcjV4c1lNQjFZMkFmRkdjL3dOQ3dnaW9wbFVZaUlEaDlMUmx3YjV2ZTZVZmFwVzZybjdjNGZ2emJlUFpkCjlEb3YxRVNzWUpkUG9ZU3YwdllSMStSRmFKWWtsY2l3NWkrZ1M3N3U0VTk5anlkNGpWK0pUL0lhdW9qeUliRmYKQXh1ek84YXUxSmZDUks4N0R0aXlUa09NeC9HSzdLWkpxTFdDVHdpVU93QVZiZndVNml4dVlXNDNJdVk5RnRzRwpwbzdGcmt6c2gxZkEyK3I5MWlaOEVWRWJZVys5RmlmMjlueGFYWWtHY3o4aGwrd2tjTUtvampHVjVEU1NBb0dDCnRCbXRKRklHczRyM0xRS0NBUUJHUU1aOUZBbVljenRkYXc0R0M1ZlkzamlrbUlRQWhYSlFUaElTZDJ6azEyRGIKZXE0OWc1dVdPeWd0WnVLbXRzc3FyRUpWM0lPQjFMbTZ4RzNzanZkS2pOc0MxRjFVdk9iS1VVd3NFTlFQYjNZUQpLUDdGM0NOYnQrc1d1em9QL29TbHAwLzMzZk9sWGw5Sm1jUmVXdkpxRXdyRGliRzRlUmJzUVNmaG05SGFYM3lkClEyUVFQNmlmY1BUM1p1YlBKczBhWlZ0TVJRQk1uYVNid2Q1bVlzc2NQbmdsNXZ4Uk1mZDFuYTJvLzJFUDZsSkIKZnViNTEzWVdMSlZrZmIwMnhKSURjVUNZR1lKMUtYTWJ3VUtveStHaEhCQWZIMi8wUjFzRUhDaXRzUEhmcnlxbwpaZXRwSU0zT0tSQmxjbkJhZmdLQStIbmplaUZNR1VPYlhPV1RJL2FuQW9JQkFGbE51eElzYUlqR1ZYMUdpNDBtCjdHRVVXaGpmUHlhc1NRQkg5d0VEaDlMc3hKRVM1dmF0THA3QUpSQlVUKzU4R0pPdnpveUY4NXpyQ0pBNzhxcnkKa2hRQjh6VXB1STl0MFlpdkx5dis4VjgxUFNFQ1UxbVY3M0NKRVE2MVpFbUhiL21rQVRaUHRNaUNOYWNtSVUregpGOFVBdjk0VEJlSEpaZ3dQd1EvMmQwajFHeU5pRGVEbjRIcDhyM2xIS0tvb1puOENIKzFnMzNvcUR2M1pueFVpCnNUdmdaTTBDSXBDYVdqSkN3NDlseUtUWS9XTFFJN1N2cUJUREdOdGxLaE42UDl4clRYcllTTFJEbk9SZVhEWlMKMUhna2Y0enBXY0RMNmVQSER4ak5hT0FXcC9HMGFZc2t2TjJtb3BIdlVYNDdFeE8xM2paZ1BkVG8zRWtMdGVvbQpaRkVDZ2dFQkFPT3d3K3RqUnhFYXNKdDgrZGUxbVJCTGh3a21tckpZQndRUUpsdi94dzNqb1czQkJ2VlhpdTdHCk9LNDZ3MkNtd2RUdCtzVWRmYXRhNTFiSVNlek5YVS9DMmhmWkNQY2FnQTIzT1JKUS8zVzR6Z1ByVEo4SWJ3SGcKN2gzd1kvZ3dWM1RyUVltMjBKeEgxbk84SWVWaVB2ZFV6eVJEYjdOZjZPWGxhb1RET1JzUGlGTXk3dW0zVm52WApGSGJWU2JneUNsaGJ6MjRKT0V0Z2xxZW4vMjBOdlJPZ0NnaHB1MXRJclgxc3VPcmdOUHhxcHJ6T1F4SEtKKzNGClFiL2NoY0pHa2dEb0lBdVZ4RUt2RUMrNWxUejZJdEc5ZGFJQUlQU3AvMjE0Z2lzUFFXTk5LbG5WUHBTaHJmTU8KMXFrMFlhNmNoYzNnSUdiVEEvcDN6Nnd4Q2xnVGFCaz0KLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo=
# kind: Secret
# metadata:
# name: student-credential
# namespace: student-ns
# type: kubernetes.io/tls