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.

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

Add base gnmi docker image #17292

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Conversation

ganglyu
Copy link
Contributor

@ganglyu ganglyu commented Nov 24, 2023

Why I did it

We have below requirements:
Need to share docker image for telemetry and gnmi for 202305 and master branch.
Need single telemetry container for 202305 branch.
Need single gnmi container for master branch.

I was using docker-sonic-gnmi as base, but this implementation does not work for single telemetry container. So I add a new base gnmi docker image for gnmi and telemetry.

close #17978

Work item tracking
  • Microsoft ADO (number only):

How I did it

Add a new base gnmi docker image, and build telemetry and gnmi image on this new image.
And I also rename telemetry.mk, telemetry.dep and SONIC_TELEMETRY.

How to verify it

Run end to end test for gnmi and telemetry.

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

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)

@@ -31,6 +31,9 @@ $(DOCKER_TELEMETRY)_CONTAINER_NAME = telemetry
$(DOCKER_TELEMETRY)_RUN_OPT += -t
$(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro
ifneq ($(INCLUDE_SYSTEM_GNMI), y)
$(DOCKER_TELEMETRY)_RUN_OPT += -v /var/run/dbus:/var/run/dbus:rw
endif
Copy link
Collaborator

Choose a reason for hiding this comment

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

why is this needed?

Copy link
Collaborator

Choose a reason for hiding this comment

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

this is telemetry

Copy link
Contributor Author

@ganglyu ganglyu Nov 29, 2023

Choose a reason for hiding this comment

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

When we disable GNMI and enable TELEMETRY like 202305 branch, telemetry needs to access dbus to support GNMI native feature.

Copy link
Collaborator

@qiluo-msft qiluo-msft Nov 30, 2023

Choose a reason for hiding this comment

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

I am not sure your goal on 202305 public repo. Is it single telemetry container or single gnmi container.

The same question is applicable to all the branch on public repos.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We have reverted all the changes on 202305 public repo, and I will only change master public repo.
For master public repo, it's single gnmi container.

rules/docker-base-gnmi.mk Outdated Show resolved Hide resolved
@ganglyu ganglyu requested a review from lguohan November 30, 2023 00:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[telemetry] Telemetry dependency for GNMI
4 participants