gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix:TSG-19943更改mrzcpd-device-plugin名称为packet-io-uio-binder并优化其日志输出

Browse Source
This commit is contained in:
linxin
2024-03-14 15:08:21 +08:00
committed by 付明卫
parent c79a569283
commit 6d9fbc84f3
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/HAL_deploy.yml
View File

@@ -179,11 +179,11 @@
roles:
- {role: container-tools-install, tags: container-tools-install}
- hosts: x86_64_COTS-packet-io-engine-deviceplugin
- hosts: x86_64_COTS-packet-io-uio-binder
remote_user: root
vars_files:
- install_config/group_vars/HAL_x86_64_COTS.yml
- install_config/group_vars/rpm_version.yml
roles:
- {role: framework, tags: framework}
- {role: mrzcpd-deviceplugin, tags: mrzcpd-deviceplugin}
- {role: packet-io-uio-binder, tags: packet-io-uio-binder}

4
ansible/install_config/group_vars/rpm_version.yml
View File

@@ -106,5 +106,5 @@ coredump_tools_rpm_version:
packet_adapter_rpm_version:
packet_adapter: packet_adapter-2.0.2.4f48b59
mrzcpd_deviceplugin_rpm_version:
mrzcpd_deviceplugin: mrzcpd-deviceplugin-1.0.6-97d7363
packet_io_uio_binder_rpm_version:
packet_io_uio_binder: packet-io-uio-binder-1.0.7-9724331

20
ansible/roles/k3s-install/files/daemonset-mrzcpd-deviceplugin.yaml → ansible/roles/k3s-install/files/packet-io-uio-binder.yaml
View File

@@ -1,27 +1,27 @@
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: packet-io-engine-deviceplugin
name: packet-io-uio-binder
labels:
app: packet-io-engine-deviceplugin
app: packet-io-uio-binder
namespace: tsg-os-system
spec:
selector:
matchLabels:
app: packet-io-engine-deviceplugin
app: packet-io-uio-binder
template:
metadata:
labels:
app: packet-io-engine-deviceplugin
app: packet-io-uio-binder
spec:
containers:
- name: packet-io-engine-deviceplugin
image: registry.gdnt-cloud.website/tsg-packet-io-engine-deviceplugin:%%MRZCPD_DEVICE_PLUGIN_IMAGE_TAG%%
- name: packet-io-uio-binder
image: registry.gdnt-cloud.website/tsg-packet-io-uio-binder:%%MRZCPD_DEVICE_PLUGIN_IMAGE_TAG%%
command:
- "bash"
- "-ec"
- |
/opt/tsg/mrzcpd-deviceplugin/bin/deviceplugin
/opt/tsg/packet-io-uio-binder/bin/deviceplugin
volumeMounts:
- name: hwfile
mountPath: /var/run/mrzcpd
@@ -34,13 +34,13 @@ spec:
securityContext:
privileged: true
initContainers:
- name: init-packet-io-engine-deviceplugin
image: registry.gdnt-cloud.website/tsg-packet-io-engine-deviceplugin:%%MRZCPD_DEVICE_PLUGIN_IMAGE_TAG%%
- name: init-packet-io-uio-binder
image: registry.gdnt-cloud.website/tsg-packet-io-uio-binder:%%MRZCPD_DEVICE_PLUGIN_IMAGE_TAG%%
command:
- "bash"
- "-ec"
- |
/opt/tsg/mrzcpd-deviceplugin/bin/generateHwfile
/opt/tsg/packet-io-uio-binder/bin/generateHwfile
volumeMounts:
- name: hwfile
mountPath: /var/run/mrzcpd

4
ansible/roles/k3s-install/tasks/main.yml
View File

@@ -127,9 +127,9 @@
name: k3s-orphaned-pods-dir-clean.timer
enabled: yes
- name: "copy mrzcpd-deviceplugin file to dest"
- name: "copy packet-io-uio-binder file to dest"
copy:
src: "{{ role_path }}/files/daemonset-mrzcpd-deviceplugin.yaml"
src: "{{ role_path }}/files/packet-io-uio-binder.yaml"
dest: /var/lib/rancher/k3s/server/manifests/
- name: "copy dynamic-hostport yaml file to k3s manifests directory"

4
ansible/roles/mrzcpd-deviceplugin/tasks/main.yml → ansible/roles/packet-io-uio-binder/tasks/main.yml
View File

@@ -1,8 +1,8 @@
---
- name: "install mrzcpd-deviceplugin"
- name: "install packet-io-uio-binder"
yum:
name:
- "{{ mrzcpd_deviceplugin_rpm_version.mrzcpd_deviceplugin }}"
- "{{ packet_io_uio_binder_rpm_version.packet_io_uio_binder }}"
conf_file: "{{ rpm_repo_config_path }}"
state: present

2
make/Makefile.x86_64_COTS
View File

@@ -14,7 +14,7 @@ APP_BUNDLE_BIN := tsg-os-${OS_RELEASE_VER}-${PROFILE_ID_IN_SHORT}-APP-BUNDLE.b
TARGET_BUILD_DIR := $(BUILDDIR_BASE)/$(PROFILE_ID)
TARGET_INSTALLER_DIR := $(TARGET_BUILD_DIR)/installer
MRZCPD_DEVICE_PLUGIN_FILE_PATH := /ansible/roles/k3s-install/files/daemonset-mrzcpd-deviceplugin.yaml
MRZCPD_DEVICE_PLUGIN_FILE_PATH := /ansible/roles/k3s-install/files/packet-io-uio-binder.yaml
MRZCPD_DEVICE_PLUGIN_IMAGE_TAG := ${OS_RELEASE_VER}
TARGET_SYSROOT_DIR := $(TARGET_BUILD_DIR)/sysroot

2
make/Makefile.x86_64_COTS_APP_BUNDLE
View File

@@ -16,7 +16,7 @@ TARGET_INSTALLER_DIR := $(TARGET_BUILD_DIR)/installer
TRAFFIC_ENGINE_HELM_FILE_PATH := /ansible/roles/traffic-engine/files/helm
INJECT_ADAPTER_HELM_FILE_PATH := /ansible/roles/packet_adapter/files/helm
MRZCPD_HELM_FILE_PATH := /ansible/roles/mrzcpd/files/helm
MRZCPD_DEVICE_PLUGIN_FILE_PATH := /ansible/roles/k3s-install/files/daemonset-mrzcpd-deviceplugin.yaml
MRZCPD_DEVICE_PLUGIN_FILE_PATH := /ansible/roles/k3s-install/files/packet-io-uio-binder.yaml
.PHONY: all build_dir installer clean_installer_dir prebuild_container_images build_container_images build_helm_charts build_app_bundle_bin

4
tools/build_container_images.sh
View File

@@ -68,7 +68,7 @@ function export_images()
${IMAGE_REPO_PREFIX}/tsg-inject:${OS_RELEASE_VER} \
${IMAGE_REPO_PREFIX}/tsg-packet-io-engine:${OS_RELEASE_VER} \
${IMAGE_REPO_PREFIX}/tsg-shaping:${OS_RELEASE_VER} \
${IMAGE_REPO_PREFIX}/tsg-packet-io-engine-deviceplugin:${OS_RELEASE_VER}
${IMAGE_REPO_PREFIX}/tsg-packet-io-uio-binder:${OS_RELEASE_VER}
}
##function define end
@@ -87,7 +87,7 @@ build_image "bfdd" "${BASE_IMAGE_NAME}" "${IMAGE_REPO_PREFIX}/tsg-bfdd:${OS
build_image "shaping" "${BASE_IMAGE_NAME}" "${IMAGE_REPO_PREFIX}/tsg-shaping:${OS_RELEASE_VER}"
build_image "inject" "${BASE_IMAGE_NAME}" "${IMAGE_REPO_PREFIX}/tsg-inject:${OS_RELEASE_VER}"
build_image "packet-io-engine" "${BASE_IMAGE_NAME}" "${IMAGE_REPO_PREFIX}/tsg-packet-io-engine:${OS_RELEASE_VER}"
build_image "packet-io-engine-deviceplugin" "${BASE_IMAGE_NAME}" "${IMAGE_REPO_PREFIX}/tsg-packet-io-engine-deviceplugin:${OS_RELEASE_VER}"
build_image "packet-io-uio-binder" "${BASE_IMAGE_NAME}" "${IMAGE_REPO_PREFIX}/tsg-packet-io-uio-binder:${OS_RELEASE_VER}"
export_images