matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add k8s support feature set and Add platform label for scheduler usage (#12997) (#13351)

Browse Source
This commit is contained in:
mssonicbld 2023-01-13 09:55:51 +08:00 committed by GitHub
parent b443cc8d52
commit 8eb1b8f680
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.work
View File

@ -344,7 +344,6 @@ SONIC_BUILD_INSTRUCTION := make \
SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \ SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
INCLUDE_KUBERNETES=$(INCLUDE_KUBERNETES) \ INCLUDE_KUBERNETES=$(INCLUDE_KUBERNETES) \
KUBERNETES_VERSION=$(KUBERNETES_VERSION) \ KUBERNETES_VERSION=$(KUBERNETES_VERSION) \
KUBERNETES_CNI_VERSION=$(KUBERNETES_CNI_VERSION) \
K8s_GCR_IO_PAUSE_VERSION=$(K8s_GCR_IO_PAUSE_VERSION) \ K8s_GCR_IO_PAUSE_VERSION=$(K8s_GCR_IO_PAUSE_VERSION) \
INCLUDE_KUBERNETES_MASTER=$(INCLUDE_KUBERNETES_MASTER) \ INCLUDE_KUBERNETES_MASTER=$(INCLUDE_KUBERNETES_MASTER) \
SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \ SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \

1
build_debian.sh
View File

@ -270,7 +270,6 @@ then
## Install Kubernetes ## Install Kubernetes
echo '[INFO] Install kubernetes' echo '[INFO] Install kubernetes'
install_kubernetes ${KUBERNETES_VERSION} install_kubernetes ${KUBERNETES_VERSION}
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install kubernetes-cni=${KUBERNETES_CNI_VERSION}
else else
echo '[INFO] Skipping Install kubernetes' echo '[INFO] Skipping Install kubernetes'
fi fi

3
rules/config
View File

@ -165,7 +165,7 @@ INCLUDE_MACSEC = y
# INCLUDE_KUBERNETES - if set to y kubernetes packages are installed to be able to # INCLUDE_KUBERNETES - if set to y kubernetes packages are installed to be able to
# run as worker node in kubernetes cluster. # run as worker node in kubernetes cluster.
INCLUDE_KUBERNETES = n INCLUDE_KUBERNETES ?= n
KUBE_DOCKER_PROXY = http://172.16.1.1:3128/ KUBE_DOCKER_PROXY = http://172.16.1.1:3128/
@ -175,7 +175,6 @@ KUBE_DOCKER_PROXY = http://172.16.1.1:3128/
# NOTE: As a worker node it has to run version compatible to kubernetes master. # NOTE: As a worker node it has to run version compatible to kubernetes master.
# #
KUBERNETES_VERSION = 1.22.2-00 KUBERNETES_VERSION = 1.22.2-00
KUBERNETES_CNI_VERSION = 0.8.7-00
K8s_GCR_IO_PAUSE_VERSION = 3.5 K8s_GCR_IO_PAUSE_VERSION = 3.5
# INCLUDE_KUBERNETES_MASTER - if set to y kubernetes packages are installed o be able # INCLUDE_KUBERNETES_MASTER - if set to y kubernetes packages are installed o be able

6
src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
View File

@ -99,6 +99,8 @@ remote_ctr_config = {
USE_K8S_PROXY: "" USE_K8S_PROXY: ""
} }
ENABLED_FEATURE_SET = {"telemetry", "snmp"}
def log_debug(m): def log_debug(m):
msg = "{}: {}".format(inspect.stack()[1][3], m) msg = "{}: {}".format(inspect.stack()[1][3], m)
syslog.syslog(syslog.LOG_DEBUG, msg) syslog.syslog(syslog.LOG_DEBUG, msg)
@ -260,6 +262,8 @@ class MainServer:
key, op, fvs = subscriber.pop() key, op, fvs = subscriber.pop()
if not key: if not key:
continue continue
if subscriber.getTableName() == FEATURE_TABLE and key not in ENABLED_FEATURE_SET:
continue
log_debug("Received message : '%s'" % str((key, op, fvs))) log_debug("Received message : '%s'" % str((key, op, fvs)))
for callback in (self.callbacks for callback in (self.callbacks
[subscriber.getDbConnector().getDbName()] [subscriber.getDbConnector().getDbName()]
@ -280,6 +284,8 @@ def set_node_labels(server):
labels["sonic_version"] = version_info['build_version'] labels["sonic_version"] = version_info['build_version']
labels["hwsku"] = device_info.get_hwsku() if not UNIT_TESTING else "mock" labels["hwsku"] = device_info.get_hwsku() if not UNIT_TESTING else "mock"
labels["deployment_type"] = dep_type labels["deployment_type"] = dep_type
platform = device_info.get_platform()
labels["worker.sonic/platform"] = platform if platform is not None else ""
server.mod_db_entry(STATE_DB_NAME, server.mod_db_entry(STATE_DB_NAME,
KUBE_LABEL_TABLE, KUBE_LABEL_SET_KEY, labels) KUBE_LABEL_TABLE, KUBE_LABEL_SET_KEY, labels)