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.

Sign up for GitHub

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

Jump to bottom

Fix elb url of eks #65

Merged
merged 3 commits into from
Aug 20, 2023
Merged

Fix elb url of eks #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcc549e
[feat/#60] Fix: change image version of control-ubuntu(creating resou…
NayeonKeum Aug 20, 2023
41ad7f3
[feat/#60] Fix: url due to changed restapi in BE
NayeonKeum Aug 20, 2023
da0de9f
[feat/#60] Fix: elb url of eks
NayeonKeum Aug 20, 2023
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
2 changes: 1 addition & 1 deletion resources/images/control-ubuntu/.env
View file
Open in desktop
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://a4916313160c74414a3426e5d3b9866c-383499736.ap-northeast-2.elb.amazonaws.com
KUBE_BASE_URL=http://af3a1a2d769ff4be9991c752a7a41937-923523649.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}

Expand Down
2 changes: 1 addition & 1 deletion resources/images/control-ubuntu/server/res/remote-deploy-professor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
spec:
containers:
- name: professor-{{ ID }}
image: ryann3/professor-ubuntu:4.2
image: ryann3/professor-ubuntu:5.0
ports:
- name: nginx-port
containerPort: 80
Expand Down
2 changes: 1 addition & 1 deletion resources/images/control-ubuntu/server/res/remote-deploy-student.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
spec:
containers:
- name: student-{{ ID }}
image: ryann3/student-ubuntu:4.2
image: ryann3/student-ubuntu:5.0
ports:
- name: nginx-port
containerPort: 80
Expand Down
2 changes: 1 addition & 1 deletion resources/images/professor-ubuntu/.env
View file
Open in desktop
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://a4916313160c74414a3426e5d3b9866c-383499736.ap-northeast-2.elb.amazonaws.com
KUBE_BASE_URL=http://af3a1a2d769ff4be9991c752a7a41937-923523649.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}

Expand Down
2 changes: 1 addition & 1 deletion resources/images/professor-ubuntu/server/getAssignments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

assignment_id = sys.argv[1]
json_str = requests.get(
Urls.base_url+"/assignment/list/"+assignment_id).text
Urls.base_url+"/assignments/"+assignment_id+"students-urls").text
data_users_assigned = list(json.loads(json_str)) # json to list[dict]

dir_path = Urls.dir_path_professor
Expand Down
2 changes: 1 addition & 1 deletion resources/images/professor-ubuntu/server/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def create_directories(assignment_id, data_users_assigned):
async def create_assignment(assignment_info: Dto.AssignmentModel = None):
assignment_id = assignment_info.assignment_id
json_str = requests.get(
Urls.base_url+"/assignment/list/"+assignment_id).text
Urls.base_url+"/assignments/"+assignment_id+"students-urls").text
data_users_assigned = list(json.loads(json_str))
due_date = assignment_info.due_date

Expand Down
2 changes: 1 addition & 1 deletion resources/images/student-ubuntu/.env
View file
Open in desktop
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://a4916313160c74414a3426e5d3b9866c-383499736.ap-northeast-2.elb.amazonaws.com
KUBE_BASE_URL=http://af3a1a2d769ff4be9991c752a7a41937-923523649.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}

Expand Down
2 changes: 1 addition & 1 deletion resources/res/.env
View file
Open in desktop
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://a4916313160c74414a3426e5d3b9866c-383499736.ap-northeast-2.elb.amazonaws.com # 8080
KUBE_BASE_URL=http://af3a1a2d769ff4be9991c752a7a41937-923523649.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}

Expand Down
Loading