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

CRI Integration using Containerd CRI #51

Merged
merged 65 commits into from
Nov 20, 2020
Merged

CRI Integration using Containerd CRI #51

merged 65 commits into from
Nov 20, 2020

Conversation

plamenmpetrov
Copy link
Collaborator

The goal is to support CRI in the orchestrator. In order to reduce code duplication, we utilize the containerd CRI as-is for all CRI calls which we do not need to change.

@ustiugov
Copy link
Member

looks good

@plamenmpetrov plamenmpetrov force-pushed the cri_integration_direct branch 2 times, most recently from 00f7f55 to 3770906 Compare October 27, 2020 11:55
ustiugov
ustiugov requested changes Oct 27, 2020
View reviewed changes
fccd-orchestrator.go Outdated Show resolved Hide resolved
fccd-orchestrator.go Outdated Show resolved Hide resolved
uc_image/uc.go Outdated Show resolved Hide resolved
cri.go Outdated Show resolved Hide resolved
ustiugov
ustiugov requested changes Oct 30, 2020
View reviewed changes
Copy link
Member

@ustiugov ustiugov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't forget to get the logs tidy (uncomment and assign the appropriate severity). Other than that looks fine for the PoC.

@plamenmpetrov plamenmpetrov force-pushed the cri_integration_direct branch 9 times, most recently from 843b391 to b74e344 Compare November 5, 2020 14:55
@ustiugov
Copy link
Member

can we merge this? what else do we need in this PR? it's getting huge

@plamenmpetrov plamenmpetrov force-pushed the cri_integration_direct branch 5 times, most recently from 78970a5 to 0d68fc0 Compare November 12, 2020 16:09
ustiugov
ustiugov requested changes Nov 12, 2020
View reviewed changes
Copy link
Member

@ustiugov ustiugov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

general comments:

  1. Test your code to run from non-sudo user
  2. Make the bash scripts modular and remove code duplication

.travis.yml Outdated Show resolved Hide resolved
cri/container_create.go Outdated Show resolved Hide resolved
cri/coordinator.go Outdated Show resolved Hide resolved
cri/coordinator.go Outdated Show resolved Hide resolved
cri/coordinator.go Show resolved Hide resolved
scripts/cri/setup_master_node.sh Outdated Show resolved Hide resolved
scripts/cri/setup_master_node.sh Outdated Show resolved Hide resolved
scripts/cri/setup_worker_kubelet.sh Outdated Show resolved Hide resolved
scripts/travis/full.sh Outdated Show resolved Hide resolved
uc/uc.go
return guestClient.SayHello(ctx, req)
}

func getFuncClient(guestIP, guestPort string) (hpb.GreeterClient, error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this code is duplicated, can we have it only in one location? maybe an extra module?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i believe we will remove this once we take care of the fake UC so maybe leave it for now?

ustiugov
ustiugov requested changes Nov 12, 2020
View reviewed changes
Copy link
Member

@ustiugov ustiugov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

general comments:

  1. make the bash scripts modular and avoid code duplication
  2. make sure everything works when running from a non-sudo user

@plamenmpetrov plamenmpetrov force-pushed the cri_integration_direct branch 7 times, most recently from 9ee4615 to 699c5a7 Compare November 19, 2020 09:15
@plamenmpetrov
scripts to run cluster with 2 nodes
27b67f3 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
fix cri test response
9084a4e 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
change default image in cri
8685d1e 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
update cri dep, and add GOPRIVATE to scripts
f328967 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
remove obsolete removeContainer
554bb4d 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
update cri dep
d75e51f 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
fix concurrency big in coordinator
76eaf48 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
top lvl deps
9b54bb6 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
cri in travis
8a4a859 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
refactor scripts
a7afce3 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
concurrency control in coord
b8394ff 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
top lvl deps
20dfa29 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
fix sudo in scripts
d6f2070 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
cri Makefile
76f3618 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
keep configs under git
6ae085e 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
individual cloudlab script, remove k8s from travis
068cbc5 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
refactor scripts
9530f30 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
consistent Knative version
438ab32 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
ustiugov
ustiugov previously approved these changes Nov 20, 2020
View reviewed changes
@plamenmpetrov
misc deps
ac2c500 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
ctriface deps
437e526 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
top lvl deps
a335239 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
update cri Makefile
f7b43aa 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
fix setup_master_node.sh
b5c2b03 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@plamenmpetrov
remove empty lines between replace
87d53cb 
Signed-off-by: Plamen Petrov <plamb0brt@gmail.com>
@ustiugov ustiugov merged commit 9620ab1 into master Nov 20, 2020
HermioneKT pushed a commit that referenced this pull request Jan 31, 2024
@KTCyber @HermioneKT
# This is a combination of 154 commits.
6674807 
# This is the 1st commit message:

refactor

# This is the commit message #2:

modify powerNodeSelector

# This is the commit message #3:

modify powerNodeSelector

# This is the commit message #4:

modify powerNodeSelector

# This is the commit message #5:

modify namespace

# This is the commit message #6:

modify namespace

# This is the commit message #7:

add namespace

# This is the commit message #8:

init power manager script

# This is the commit message #9:

add go code

# This is the commit message #10:

test

# This is the commit message #11:

test

# This is the commit message #12:

test

# This is the commit message #13:

test

# This is the commit message #14:

go.sum

# This is the commit message #15:

go sum

# This is the commit message #16:

go mod tidy

# This is the commit message #17:

test

# This is the commit message #18:

test

# This is the commit message #19:

test

# This is the commit message #20:

test

# This is the commit message #21:

test

# This is the commit message #22:

test

# This is the commit message #23:

test

# This is the commit message #24:

test

# This is the commit message #25:

test

# This is the commit message #26:

test

# This is the commit message #27:

test

# This is the commit message #28:

test

# This is the commit message #29:

print output

# This is the commit message #30:

test

# This is the commit message #31:

test

# This is the commit message #32:

test

# This is the commit message #33:

test

# This is the commit message #34:

test

# This is the commit message #35:

test

# This is the commit message #36:

test

# This is the commit message #37:

test

# This is the commit message #38:

test

# This is the commit message #39:

test

# This is the commit message #40:

refactor

# This is the commit message #41:

change val

# This is the commit message #42:

test

# This is the commit message #43:

test

# This is the commit message #44:

test

# This is the commit message #45:

exp1

# This is the commit message #46:

add url

# This is the commit message #47:

test

# This is the commit message #48:

test

# This is the commit message #49:

test auth

# This is the commit message #50:

test

# This is the commit message #51:

test

# This is the commit message #52:

test

# This is the commit message #53:

test

# This is the commit message #54:

test

# This is the commit message #55:

fix bug

# This is the commit message #56:

remove log

# This is the commit message #57:

test

# This is the commit message #58:

test

# This is the commit message #59:

test

# This is the commit message #60:

fix loop

# This is the commit message #61:

increase invocation

# This is the commit message #62:

test

# This is the commit message #63:

test

# This is the commit message #64:

test

# This is the commit message #65:

test

# This is the commit message #66:

test

# This is the commit message #67:

test

# This is the commit message #68:

test

# This is the commit message #69:

Test

# This is the commit message #70:

test

# This is the commit message #71:

test

# This is the commit message #72:

test

# This is the commit message #73:

test

# This is the commit message #74:

test

# This is the commit message #75:

test

# This is the commit message #76:

test

# This is the commit message #77:

test

# This is the commit message #78:

test

# This is the commit message #79:

test

# This is the commit message #80:

test

# This is the commit message #81:

test

# This is the commit message #82:

test

# This is the commit message #83:

test

# This is the commit message #84:

test

# This is the commit message #85:

test

# This is the commit message #86:

test

# This is the commit message #87:

test

# This is the commit message #88:

test

# This is the commit message #89:

test

# This is the commit message #90:

test1

# This is the commit message #91:

test

# This is the commit message #92:

test

# This is the commit message #93:

test

# This is the commit message #94:

test

# This is the commit message #95:

test

# This is the commit message #96:

test

# This is the commit message #97:

test

# This is the commit message #98:

test

# This is the commit message #99:

test

# This is the commit message #100:

test

# This is the commit message #101:

test

# This is the commit message #102:

test

# This is the commit message #103:

test

# This is the commit message #104:

test

# This is the commit message #105:

test

# This is the commit message #106:

test

# This is the commit message #107:

test

# This is the commit message #108:

test

# This is the commit message #109:

test1

# This is the commit message #110:

test

# This is the commit message #111:

test

# This is the commit message #112:

Test

# This is the commit message #113:

test

# This is the commit message #114:

test

# This is the commit message #115:

test

# This is the commit message #116:

test

# This is the commit message #117:

test

# This is the commit message #118:

test

# This is the commit message #119:

Test

# This is the commit message #120:

Test

# This is the commit message #121:

test

# This is the commit message #122:

test

# This is the commit message #123:

Test

# This is the commit message #124:

test

# This is the commit message #125:

test

# This is the commit message #126:

test

# This is the commit message #127:

test

# This is the commit message #128:

test

# This is the commit message #129:

test

# This is the commit message #130:

test

# This is the commit message #131:

test

# This is the commit message #132:

test

# This is the commit message #133:

test

# This is the commit message #134:

test

# This is the commit message #135:

test

# This is the commit message #136:

test

# This is the commit message #137:

test

# This is the commit message #138:

test

# This is the commit message #139:

test

# This is the commit message #140:

test

# This is the commit message #141:

test

# This is the commit message #142:

test

# This is the commit message #143:

Test

# This is the commit message #144:

Test

# This is the commit message #145:

Test

# This is the commit message #146:

Test

# This is the commit message #147:

test

# This is the commit message #148:

test

# This is the commit message #149:

test

# This is the commit message #150:

test

# This is the commit message #151:

test

# This is the commit message #152:

test

# This is the commit message #153:

test

# This is the commit message #154:

Test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ustiugov ustiugov ustiugov approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Finalize cri integration
2 participants
@plamenmpetrov @ustiugov