.gitlab-ci.yml

@@ -4,7 +4,6 @@ variables:
     GOSDN_TESTING_IMAGE: "${CI_REGISTRY_IMAGE}:testing_${DOCKER_TAG}"
     GOSDN_INTEGRATION_TEST_IMAGE: "${CI_REGISTRY_IMAGE}/integration-tests:${DOCKER_TAG}"
     CEOS_IMAGE: "${CI_PCONTAINERS_REGISTRY_IMAGE}/ceos:4.28.2F"
-    CLAB_VERSION: "0.48.6"
     GOLANG_VERSION: "1.21"
     GNMI_TARGET_IMAGE: registry.code.fbi.h-da.de/danet/gnmi-target/debian:master
     GNMI_TARGET_INTEGRATION_IMAGE: "$CI_REGISTRY_IMAGE/gnmi-target-integration-test:${CI_COMMIT_SHA}"
@@ -31,9 +30,6 @@ include:
     - local: "/.gitlab/ci/.code-quality-ci.yml"
     - local: "/.gitlab/ci/.security-and-compliance-ci.yml"
     - local: "/.gitlab/ci/.test.yml"
-    - local: "/.gitlab/ci/.uml-autogen-ci.yml"
     - local: "/.gitlab/ci/.renovate.yml"
     - local: "/.gitlab/ci/.mk-docs-deploy.yml"
     - local: "/.gitlab/ci/legacy/.test.yml"
-    #- local: "/.gitlab/ci/legacy/.integration-test-containerlab.yml"
-    #- local: "/.gitlab/ci/legacy/.integration-test.yml"

.gitlab/ci/.deploy-k8s.yml

-build:k8s-bot:
-    stage: build
-    image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golang:$GOLANG_VERSION
-    rules:
-        - if: $CI_COMMIT_BRANCH == "develop"
-        - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    script:
-        - cd build/cd
-        - go build -o k8s-bot
-    artifacts:
-        name: binary
-        paths:
-            - build/cd/k8s-bot
-
-.deploy: &deploy
-    image:
-        name: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/bitnami/kubectl:latest
-        entrypoint: [""]
-    before_script:
-        - echo "override global before script"
-    variables:
-        K8S_OP: "create"
-    script:
-        - ./build/cd/k8s-bot
-
-deploy:develop:
-    <<: *deploy
-    stage: deploy
-    needs:
-        - job: "build-docker"
-        - job: "build:k8s-bot"
-          artifacts: true
-    rules:
-        - if: $CI_COMMIT_BRANCH == "develop" && $CI_NIGHTLY == null
-
-deploy:latest:
-    <<: *deploy
-    stage: deploy
-    needs:
-        - job: "build-docker"
-        - job: "build:k8s-bot"
-          artifacts: true
-    rules:
-        - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_NIGHTLY == null
-
-deploy:nightly:mainline:
-    <<: *deploy
-    stage: deploy
-    needs:
-        - job: "build-docker"
-        - job: "build:k8s-bot"
-          artifacts: true
-    rules:
-        - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_NIGHTLY == "mainline"
-
-deploy:nightly:develop:
-    <<: *deploy
-    stage: deploy
-    needs:
-        - job: "build-docker"
-        - job: "build:k8s-bot"
-          artifacts: true
-    rules:
-        - if: $CI_COMMIT_BRANCH == "develop" && $CI_NIGHTLY == "mainline"

.gitlab/ci/.uml-autogen-ci.yml

-goplantuml:
-    image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golang:$GOLANG_VERSION
-    stage: .post
-    only:
-        - develop
-    when: manual
-    variables:
-        FILENAME: "home.md"
-        WIKI_URL: "${CI_SERVER_PROTOCOL}://project_${CI_PROJECT_ID}_bot3:${GOPLANTUML_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/${CI_PROJECT_PATH}.wiki.git"
-
-    script:
-        # install goplantuml
-        - go get github.com/jfeliu007/goplantuml/cmd/goplantuml
-        # remove old wiki folder
-        - rm -rf "/tmp/${CI_PROJECT_NAME}.wiki"
-        # clone and move to wiki folder
-        - cd /tmp
-        - git clone "${WIKI_URL}"
-        - cd "${CI_PROJECT_NAME}.wiki"
-
-        - echo '```plantuml' > "$FILENAME"
-        # run goplantuml
-        - goplantuml "${CI_PROJECT_DIR}/nucleus/" >> "$FILENAME"
-        - echo '```' >> "$FILENAME"
-
-        # git commit
-        - git config user.name "$GITLAB_USER_NAME"
-        - git config user.email "$GITLAB_USER_EMAIL"
-        - git add "$FILENAME"
-        - git commit -m "Auto-updated UML diagram via goplantuml CI job"
-        - git push origin "HEAD:master"

.gitlab/ci/legacy/.integration-test-containerlab.yml

-variables:
-    CLAB_TEMPLATE: "${CI_PROJECT_DIR}/controller/test/containerlab/int01.clab.tmpl.yml"
-    CLAB_DIR: "/home/gitlab-runner/clab"
-    CLAB_NAME: "clab${CI_PIPELINE_IID}"
-
-legacy-containerlab-deploy:
-    stage: test-legacy
-    tags:
-        - shell-containerlab
-    needs: ["build-controller-image", "build-controller-testing-image"]
-    script:
-        - firstOctet=$(python3 ${CI_PROJECT_DIR}/.gitlab/ci/scripts/generate_octet.py $CI_COMMIT_SHA)
-        - secondOctet=$(python3 ${CI_PROJECT_DIR}/.gitlab/ci/scripts/generate_octet.py $CI_PIPELINE_ID)
-        - export CLAB_MGMT_SUBNET="172.$firstOctet.$secondOctet.0/24"
-        - cd ${CLAB_DIR}
-        - ls -la
-        - |
-            sed -e "s|@@CEOS_CONTAINER_IMAGE@@|${CEOS_IMAGE}|g" \
-                -e "s|@@GOSDN_CONTAINER_IMAGE@@|${GOSDN_IMAGE}|g" \
-                -e "s|@@CLAB_NAME@@|${CLAB_NAME}|g" \
-                -e "s|@@CLAB_MGMT_SUBNET@@|${CLAB_MGMT_SUBNET}|g" \
-                ${CLAB_TEMPLATE} > ${CLAB_NAME}.clab.yml
-        - cat ${CLAB_NAME}.clab.yml
-        - echo "${DOCKER_AUTH_CONFIG}" > ~/.docker/config.json | docker login $CI_REGISTRY
-        - echo ${GOSDN_IMAGE}
-        - docker pull ${GOSDN_IMAGE}
-        - docker pull ${CEOS_IMAGE}
-        - sudo containerlab deploy --topo ${CLAB_DIR}/${CLAB_NAME}.clab.yml --reconfigure
-        - |
-            echo -e "\
-            GOSDN_HTTP_PORT=$(${CI_PROJECT_DIR}/.gitlab/ci/scripts/docker_host_port 8080 clab-${CLAB_NAME}-gosdn)\n\
-            GOSDN_GRPC_PORT=$(${CI_PROJECT_DIR}/.gitlab/ci/scripts/docker_host_port 55055 clab-${CLAB_NAME}-gosdn)\n\
-            CEOS1_PORT=$(${CI_PROJECT_DIR}/.gitlab/ci/scripts/docker_host_port 6030 clab-${CLAB_NAME}-ceos1)" \
-            > ${CI_PROJECT_DIR}/build.env
-        - cat ${CI_PROJECT_DIR}/build.env
-    artifacts:
-        reports:
-            dotenv: ${CI_PROJECT_DIR}/build.env
-
-
-legacy-containerlab-destroy:
-    stage: test-legacy
-    tags:
-        - shell-containerlab
-    needs:
-        [
-            "legacy-containerlab-deploy",
-            "legacy-integration-test-legacy:nucleus",
-            "legacy-integration-test-legacy:api"
-        ]
-    before_script:
-        - cd ${CLAB_DIR}
-    script:
-        - sudo containerlab destroy --topo ${CLAB_DIR}/${CLAB_NAME}.clab.yml -c
-        - docker volume rm -f ${CLAB_NAME}-volume
-        - echo ${CLAB_NAME}
-        - ls -la
-        - rm ${CLAB_DIR}/${CLAB_NAME}.clab.yml || true
-        - rm ${CLAB_DIR}/.${CLAB_NAME}.clab.yml.bak || true
-        - sudo rm -r ${CLAB_DIR}/clab-${CLAB_NAME} || true
-        - ls -la
-
-    allow_failure: true
-
-
-#containerlab:clean:
-#    stage: .post
-#    tags:
-#        - shell-containerlab
-#    before_script:
-#        - cd ${CLAB_DIR}
-#    script:
-#        - docker kill $(docker ps -q) || true
-#        - docker rm $(docker ps -a -q) || true
-#        - docker rmi $(docker images | grep 'registry.code.fbi.h-da.de/danet/gosdn ' | awk '{print $3}') || true
-#        - sudo rm -rf ${CLAB_DIR}/clab-* || true
-#        - sudo sed -i 's|.*clab.*||g' /etc/hosts
-#    allow_failure: true
-#    rules:
-#        - if: $CI_SCHEDULE_CLEAN
-#          when: always

.gitlab/ci/legacy/.integration-test.yml

-.legacy-integration-test: &legacy-integration-test
-    image: $GOSDN_TESTING_IMAGE
-    stage: test-legacy
-    needs:
-        ["legacy-containerlab-deploy"]
-    variables:
-        GOSDN_LOG: "nolog"
-        GOSDN_TEST_API_ENDPOINT: "10.254.254.105:${GOSDN_GRPC_PORT}"
-        CEOS_TEST_ENDPOINT: "10.254.254.105:${CEOS1_PORT}"
-        GOSDN_TEST_USER: "admin"
-        GOSDN_TEST_PASSWORD: "admin"
-
-legacy-integration-test-legacy:nucleus:
-    <<: *legacy-integration-test
-    script:
-        - ${CI_PROJECT_DIR}/.gitlab/ci/scripts/wait-for-it.sh ${CEOS_TEST_ENDPOINT} -s -t 180 -- echo "CEOS is up"
-        - cd controller/
-        - make integration-test-nucleus
-
-legacy-integration-test-legacy:api:
-    <<: *legacy-integration-test
-    variables:
-        K8S_OP: "getenv"
-    script:
-        - cd controller/
-        - make integration-test-api
-
-legacy-integration-test:cli:
-    <<: *legacy-integration-test
-    script:
-        - cd cli/
-        - echo "Your tests here"

go.mod

@@ -24,8 +24,8 @@ require (
 	github.com/stretchr/testify v1.8.4
 	go.mongodb.org/mongo-driver v1.12.1
 	golang.org/x/sync v0.5.0
-	google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f // indirect
-	google.golang.org/grpc v1.59.0
+	google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect
+	google.golang.org/grpc v1.60.0
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -94,7 +94,7 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-plugin v1.4.10
 	github.com/lesismal/nbio v1.3.20
-	google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4
+	google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0
 )
 
 require (
@@ -123,5 +123,5 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231211222908-989df2bf70f3 // indirect
 )

go.sum

@@ -1699,6 +1699,8 @@ google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2Ky
 google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY=
 google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg=
 google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY=
+google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 h1:1hfbdAfFbkmpg41000wDVqr7jUpK/Yo+LPnIxxGzmkg=
+google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3/go.mod h1:5RBcpGRxr25RbDzY5w+dmaqpSEvl8Gwl1x2CICf60ic=
 google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q=
 google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
 google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb h1:lK0oleSc7IQsUxO3U5TjL9DWlsxpEBemh+zpB7IqhWI=
@@ -1711,6 +1713,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f h1:
 google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f/go.mod h1:Uy9bTZJqmfrw2rIBxgGLnamc78euZULUBrLZ9XTITKI=
 google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 h1:ZcOkrmX74HbKFYnpPY8Qsw93fC29TbJXspYKaBkSXDQ=
 google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4/go.mod h1:k2dtGpRrbsSyKcNPKKI5sstZkrNCZwpU/ns96JoHbGg=
+google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 h1:s1w3X6gQxwrLEpxnLd/qXTVLgQE2yXwaOaoa6IlY/+o=
+google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb h1:Isk1sSH7bovx8Rti2wZK0UZF6oraBDK74uoyLEEVFN0=
@@ -1723,6 +1727,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231211222908-989df2bf70f3 h1:kzJAXnzZoFbe5bhZd4zjUuHos/I31yH4thfMb/13oVY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231211222908-989df2bf70f3/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM=
 google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -1758,6 +1764,8 @@ google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=
 google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
 google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
 google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
+google.golang.org/grpc v1.60.0 h1:6FQAR0kM31P6MRdeluor2w2gPaS4SVNrD/DNTxrQ15k=
+google.golang.org/grpc v1.60.0/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=