Skip to content
Snippets Groups Projects
Commit 2f182d43 authored by Malte Bauch's avatar Malte Bauch
Browse files

Resolve "Update the way of building gnmi target container in Makefile" 

See merge request !502
parent 15e1d917
Branches
Tags
1 merge request!502Resolve "Update the way of building gnmi target container in Makefile"
Pipeline #159580 failed
Stage: build
Stage: test
Stage: analyze
Stage: integration-test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Makefile
+ 13
− 12
View file @ 2f182d43
......@@ -95,7 +95,7 @@ build-gosdnc: pre
build-orchestrator: pre
CGO_ENABLED=0 $(GOBUILD) -o $(BUILD_ARTIFACTS_PATH)/orchestrator ./csbi/cmd/csbi/
build-plugin-registry: pre build-plugins
build-plugin-registry: pre
CGO_ENABLED=0 $(GOBUILD) -o $(BUILD_ARTIFACTS_PATH)/plugin-registry ./plugin-registry/
build-venv-manager: pre
......@@ -110,9 +110,7 @@ build-hostname-checker-app: pre
build-basic-interface-monitoring-app: pre
$(GOBUILD) -trimpath -o $(BUILD_ARTIFACTS_PATH)/basic-interface-monitoring ./applications/basic-interface-monitoring
containerize-all: containerize-gosdn containerize-gosdnc containerize-plugin-registry containerize-target
containerize-slim: containerize-gosdn containerize-gosdnc containerize-plugin-registry
containerize-all: containerize-gosdn containerize-gosdnc containerize-plugin-registry
containerize-gosdn:
docker buildx build --rm -t gosdn --load -f controller/controller.Dockerfile .
......@@ -126,9 +124,6 @@ containerize-venv-manager:
containerize-orchestrator:
docker buildx build --rm -t orchestrator --load -f csbi/csbi.Dockerfile .
containerize-target:
docker buildx build --rm -t gnmi-target --load -f csbi/gnmi-target/gnmitarget.Dockerfile .
containerize-plugin-registry:
docker buildx build --rm -t plugin-registry --load -f plugin-registry/plugin-registry.Dockerfile .
......@@ -138,20 +133,19 @@ containerize-arista-routing-engine-app:
containerize-hostname-checker-app:
docker buildx build --rm -t hostname-checker-app -f applications/hostname-checker/hostname-checker.Dockerfile .
containerlab-start: create-clab-dir containerize-all
containerlab-start: create-clab-dir containerize-all generate-gnmi-target-certs
cd $(CLAB_DIR) &&\
sudo containerlab deploy --topo $(MAKEFILE_DIR)dev_env_data/clab/gosdn.clab.yaml
# build gnmi-target docker file before use
containerlab-slim-start: create-clab-dir containerize-slim
containerlab-slim-start: create-clab-dir containerize-all generate-gnmi-target-certs
cd $(CLAB_DIR) &&\
sudo containerlab deploy --topo $(MAKEFILE_DIR)dev_env_data/clab/gosdn_slim.clab.yaml
containerlab-slim-start-reconfigure: create-clab-dir containerize-slim
containerlab-slim-start-reconfigure: create-clab-dir containerize-all generate-gnmi-target-certs
cd $(CLAB_DIR) &&\
sudo containerlab deploy --topo $(MAKEFILE_DIR)dev_env_data/clab/gosdn_slim.clab.yaml --reconfigure
containerlab-start-reconfigure: create-clab-dir containerize-all
containerlab-start-reconfigure: create-clab-dir containerize-all generate-gnmi-target-certs
cd $(CLAB_DIR) &&\
sudo containerlab deploy --topo $(MAKEFILE_DIR)dev_env_data/clab/gosdn.clab.yaml --reconfigure
......@@ -167,6 +161,13 @@ containerlab-graph: create-clab-dir
cd $(CLAB_DIR) &&\
sudo containerlab graph --topo $(MAKEFILE_DIR)dev_env_data/clab/gosdn.clab.yaml
generate-gnmi-target-certs: pre
if [ ! -d "$(BUILD_ARTIFACTS_PATH)/ssl" ]; then \
mkdir -p $(BUILD_ARTIFACTS_PATH)/ssl/private; \
mkdir -p $(BUILD_ARTIFACTS_PATH)/ssl/certs; \
openssl req -x509 -nodes -days 365 -newkey rsa:4096 -keyout $(BUILD_ARTIFACTS_PATH)/ssl/private/gnmi-target-selfsigned.key -out $(BUILD_ARTIFACTS_PATH)/ssl/certs/gnmi-target-selfsigned.crt; \
fi
shell-gosdn:
docker exec -it clab-gosdn_csbi_arista_base-gosdn bash
......
dev_env_data/clab/demo.clab.yaml
+ 13
− 1
View file @ 2f182d43
......@@ -19,18 +19,30 @@ topology:
client0:
kind: linux
image: registry.code.fbi.h-da.de/danet/gnmi-target/ubuntu:develop
binds:
- ../../artifacts/ssl:/etc/gnmi-target/ssl
cmd:
start --cert /etc/gnmi-target/ssl/certs/gnmi-target-selfsigned.crt --key /etc/gnmi-target/ssl/private/gnmi-target-selfsigned.key
mgmt-ipv4: 172.100.0.3
group: server
client1:
kind: linux
image: registry.code.fbi.h-da.de/danet/gnmi-target/ubuntu:develop
binds:
- ../../artifacts/ssl:/etc/gnmi-target/ssl
cmd:
start --cert /etc/gnmi-target/ssl/certs/gnmi-target-selfsigned.crt --key /etc/gnmi-target/ssl/private/gnmi-target-selfsigned.key
mgmt-ipv4: 172.100.0.4
group: server
client2:
kind: linux
image: registry.code.fbi.h-da.de/danet/gnmi-target/debian:develop
image: registry.code.fbi.h-da.de/danet/gnmi-target/ubuntu:develop
binds:
- ../../artifacts/ssl:/etc/gnmi-target/ssl
cmd:
start --cert /etc/gnmi-target/ssl/certs/gnmi-target-selfsigned.crt --key /etc/gnmi-target/ssl/private/gnmi-target-selfsigned.key
mgmt-ipv4: 172.100.0.5
group: server
......
dev_env_data/clab/gosdn.clab.yaml
+ 5
− 13
View file @ 2f182d43
......@@ -47,9 +47,13 @@ topology:
gnmi-target:
kind: linux
image: gnmi-target
image: registry.code.fbi.h-da.de/danet/gnmi-target/ubuntu:develop
binds:
- ../../artifacts/ssl:/etc/gnmi-target/ssl
ports:
- 7030:7030
cmd:
start --cert /etc/gnmi-target/ssl/certs/gnmi-target-selfsigned.crt --key /etc/gnmi-target/ssl/private/gnmi-target-selfsigned.key
mgmt-ipv4: 172.100.0.6
plugin-registry:
......@@ -57,18 +61,6 @@ topology:
image: plugin-registry
mgmt-ipv4: 172.100.0.16
#csbi-orchestrator:
# kind: linux
# image: orchestrator
# ports:
# - 55056:55056
# - 9338:9338
# binds:
# - /var/run/docker.sock:/var/run/docker.sock
# - ./csbi/.csbi.yaml:/etc/.csbi.yml
# cmd: --log-level trace --config /etc/.csbi.yml
# mgmt-ipv4: 172.100.0.7
grafana:
kind: linux
image: grafana/grafana:8.1.2
......
dev_env_data/clab/gosdn_slim.clab.yaml
+ 10
− 6
View file @ 2f182d43
......@@ -28,21 +28,25 @@ topology:
gnmi-target-switch0:
kind: linux
image: gnmi-target
image: registry.code.fbi.h-da.de/danet/gnmi-target/ubuntu:develop
binds:
- ../../artifacts/ssl:/etc/gnmi-target/ssl
ports:
- 7030:7030
cmd:
start --log debug --insecure true
cmd:
start --cert /etc/gnmi-target/ssl/certs/gnmi-target-selfsigned.crt --key /etc/gnmi-target/ssl/private/gnmi-target-selfsigned.key
mgmt-ipv4: 172.100.0.11
startup-delay: 5
gnmi-target-switch1:
kind: linux
image: gnmi-target
image: registry.code.fbi.h-da.de/danet/gnmi-target/ubuntu:develop
binds:
- ../../artifacts/ssl:/etc/gnmi-target/ssl
ports:
- 7031:7030
cmd:
start --log debug --insecure true
cmd:
start --cert /etc/gnmi-target/ssl/certs/gnmi-target-selfsigned.crt --key /etc/gnmi-target/ssl/private/gnmi-target-selfsigned.key
mgmt-ipv4: 172.100.0.12
startup-delay: 5
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment