Move k8s script to docker-config-engine #14788

lixiaoyuner · 2023-04-21T08:19:29Z

Why I did it

To reduce the container's dependency from host system

Work item tracking

Microsoft ADO (number only):
17852636

How I did it

Move the k8s container startup script to config engine container, other than mount it from host.

How to verify it

Check file path(/usr/share/sonic/scripts/container_startup.py) inside config engine container.

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Yun Li <yunli1@microsoft.com>

ganglyu

LGTM

qiluo-msft · 2023-05-09T01:02:55Z

dockers/docker-dhcp-relay/start.sh

@@ -5,7 +5,7 @@ if [ "${RUNTIME_OWNER}" == "" ]; then
 fi

 CTR_SCRIPT="/usr/share/sonic/scripts/container_startup.py"
-if test -f ${CTR_SCRIPT}
+if [ $RUNTIME_OWNER = "kube" ] && test -f ${CTR_SCRIPT}


test

I am confused:
If $RUNTIME_OWNER=="kube" and CTR_SCRIPT does not exist, you run the script? #Closed

This code means if $RUNTIME_OWNER=="kube" and CTR_SCRIPT exists, than I run the script

Will run the script every time and check inside the script to decide to continue code is here.

qiluo-msft · 2023-05-09T01:04:02Z

rules/config

@@ -178,7 +178,7 @@ INCLUDE_ROUTER_ADVERTISER ?= y

 # INCLUDE_KUBERNETES - if set to y kubernetes packages are installed to be able to
 # run as worker node in kubernetes cluster.
-INCLUDE_KUBERNETES ?= n
+INCLUDE_KUBERNETES ?= y


y

This is behavior change. Other changes in this file is refactoring. Could you separate into multiple PRs? #Closed

Yes, I just enable it for this moment to check PR build tests pass rate. Should disable it as default.

qiluo-msft · 2023-05-09T01:05:05Z

src/sonic-ctrmgrd/ctrmgr/container

@@ -11,7 +11,7 @@ import datetime
 import docker
 from swsscommon import swsscommon

-CTR_STATE_SCR_PATH = '/usr/share/sonic/scripts/container_startup.py'
+CTR_STATE_SCR_PATH = '/etc/sonic/remote_ctr.config.json'


remote_ctr.config.json

Original it is a script, and name SCR is script. Why it is now a json file? #Closed

The logic here is to check whether k8s feature is included. If the file exists, it means included. So just check file whether exists, don't care the content.

Do you also want to change CTR_STATE_SCR_PATH -> CTRMGRD_SERVICE_PATH

Thanks, changed.

files/build_templates/docker_image_ctl.j2

files/build_templates/sonic_debian_extension.j2

src/sonic-ctrmgrd/ctrmgr/container_startup.py

Why I did it To reduce the container's dependency from host system Work item tracking Microsoft ADO (number only): 17713469 How I did it Move the k8s container startup script to config engine container, other than mount it from host. How to verify it Check file path(/usr/share/sonic/scripts/container_startup.py) inside config engine container. Signed-off-by: Yun Li <yunli1@microsoft.com> Co-authored-by: Qi Luo <qiluo-msft@users.noreply.github.com>

mssonicbld · 2023-07-07T16:18:38Z

@lixiaoyuner PR conflicts with 202205 branch

mssonicbld · 2023-07-07T16:18:38Z

@lixiaoyuner PR conflicts with 202211 branch

Why I did it To reduce the container's dependency from host system Work item tracking Microsoft ADO (number only): 17713469 How I did it Move the k8s container startup script to config engine container, other than mount it from host. How to verify it Check file path(/usr/share/sonic/scripts/container_startup.py) inside config engine container. Signed-off-by: Yun Li <yunli1@microsoft.com> Co-authored-by: Qi Luo <qiluo-msft@users.noreply.github.com>

mssonicbld · 2023-07-18T02:27:09Z

@lixiaoyuner PR conflicts with 202305 branch

Why I did it To reduce the container's dependency from host system Work item tracking Microsoft ADO (number only): 17713469 How I did it Move the k8s container startup script to config engine container, other than mount it from host. How to verify it Check file path(/usr/share/sonic/scripts/container_startup.py) inside config engine container. Signed-off-by: Yun Li <yunli1@microsoft.com> Co-authored-by: Qi Luo <qiluo-msft@users.noreply.github.com>

Related work items: sonic-net#94, sonic-net#13789, sonic-net#14149, sonic-net#14515, sonic-net#14788, sonic-net#14922, sonic-net#14933, sonic-net#15284, sonic-net#15383, sonic-net#15464, sonic-net#15519, sonic-net#15521, sonic-net#15575, sonic-net#15636, sonic-net#15652, sonic-net#15684, sonic-net#15708, sonic-net#15725, sonic-net#15739, sonic-net#15755, sonic-net#15756, sonic-net#15757

Move k8s script to config engine container for telemetry

cab707c

Signed-off-by: Yun Li <yunli1@microsoft.com>

lixiaoyuner requested review from qiluo-msft, xumia and lguohan as code owners April 21, 2023 08:19

lixiaoyuner added 5 commits April 23, 2023 19:04

Update

4140562

Enable k8s for the moment

5bd3cf3

Check kube or local to decide execution of script

1a08821

Merge branch 'master' into add-k8s-script-to-base-container

339233a

Enable k8s for checking

f0cd6c1

ganglyu previously approved these changes Apr 28, 2023

View reviewed changes

lixiaoyuner changed the title ~~Move k8s script to config engine container for telemetry~~ Move k8s script to config engine container May 4, 2023

Disable k8s as default

7014bca

lixiaoyuner dismissed ganglyu’s stale review via 7014bca May 4, 2023 04:03

Drop disable feature set

e984011

ganglyu previously approved these changes May 8, 2023

View reviewed changes

qiluo-msft reviewed May 9, 2023

View reviewed changes

Disable k8s as default

98209f6

lixiaoyuner dismissed ganglyu’s stale review via 98209f6 May 9, 2023 10:08

lixiaoyuner added 5 commits May 31, 2023 13:46

Include k8s for test

bf36f85

Remove conditions of executing k8s script

c7f9540

Update

eebb4b0

Do not run the script if k8s is disabled

3925c93

Disable k8s feature as default

94e8cd2

ganglyu approved these changes Jun 9, 2023

View reviewed changes

losha228 reviewed Jun 9, 2023

View reviewed changes

files/build_templates/docker_image_ctl.j2 Show resolved Hide resolved

files/build_templates/sonic_debian_extension.j2 Show resolved Hide resolved

src/sonic-ctrmgrd/ctrmgr/container_startup.py Show resolved Hide resolved

losha228 approved these changes Jun 9, 2023

View reviewed changes

Update container ctrmgrd service file variable name

679db38

qiluo-msft previously approved these changes Jun 21, 2023

View reviewed changes

lguohan disabled auto-merge July 5, 2023 21:44

lguohan merged commit ca29197 into sonic-net:master Jul 5, 2023

lixiaoyuner added Request for 202205 Branch Request for 202211 Branch Request for 202305 Branch labels Jul 6, 2023

yxieca added Approved for 202205 Branch Approved for 202211 Branch labels Jul 7, 2023

mssonicbld added Cherry Pick Conflict_202205 Cherry Pick Conflict_202211 labels Jul 7, 2023

yxieca added the Included in 202205 Branch label Jul 7, 2023

yxieca mentioned this pull request Jul 7, 2023

Move k8s script to docker-config-engine (#14788) #15740

Merged

yxieca mentioned this pull request Jul 10, 2023

Move k8s script to docker-config-engine (#14788) #15767

Merged

yxieca added the Included in 202211 Branch label Jul 10, 2023

StormLiangMS added the Approved for 202305 Branch label Jul 18, 2023

mssonicbld added the Cherry Pick Conflict_202305 label Jul 18, 2023

StormLiangMS added Included in 202305 Branch and removed Approved for 202305 Branch labels Jul 18, 2023

lixiaoyuner deleted the add-k8s-script-to-base-container branch February 7, 2024 06:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move k8s script to docker-config-engine #14788

Move k8s script to docker-config-engine #14788

lixiaoyuner commented Apr 21, 2023 •

edited

Loading

ganglyu left a comment

qiluo-msft May 9, 2023 •

edited

Loading

lixiaoyuner May 9, 2023

lixiaoyuner Jun 5, 2023 •

edited

Loading

qiluo-msft May 9, 2023 •

edited

Loading

lixiaoyuner May 9, 2023

qiluo-msft May 9, 2023 •

edited

Loading

lixiaoyuner May 9, 2023 •

edited

Loading

qiluo-msft Jun 21, 2023

lixiaoyuner Jun 21, 2023

mssonicbld commented Jul 7, 2023

mssonicbld commented Jul 7, 2023

mssonicbld commented Jul 18, 2023

Move k8s script to docker-config-engine #14788

Move k8s script to docker-config-engine #14788

Conversation

lixiaoyuner commented Apr 21, 2023 • edited Loading

Why I did it

Work item tracking

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

ganglyu left a comment

Choose a reason for hiding this comment

qiluo-msft May 9, 2023 • edited Loading

Choose a reason for hiding this comment

lixiaoyuner May 9, 2023

Choose a reason for hiding this comment

lixiaoyuner Jun 5, 2023 • edited Loading

Choose a reason for hiding this comment

qiluo-msft May 9, 2023 • edited Loading

Choose a reason for hiding this comment

lixiaoyuner May 9, 2023

Choose a reason for hiding this comment

qiluo-msft May 9, 2023 • edited Loading

Choose a reason for hiding this comment

lixiaoyuner May 9, 2023 • edited Loading

Choose a reason for hiding this comment

qiluo-msft Jun 21, 2023

Choose a reason for hiding this comment

lixiaoyuner Jun 21, 2023

Choose a reason for hiding this comment

mssonicbld commented Jul 7, 2023

mssonicbld commented Jul 7, 2023

mssonicbld commented Jul 18, 2023

lixiaoyuner commented Apr 21, 2023 •

edited

Loading

qiluo-msft May 9, 2023 •

edited

Loading

lixiaoyuner Jun 5, 2023 •

edited

Loading

qiluo-msft May 9, 2023 •

edited

Loading

qiluo-msft May 9, 2023 •

edited

Loading

lixiaoyuner May 9, 2023 •

edited

Loading