Commit 839d9ed4 authored by Andrea Sgambelluri's avatar Andrea Sgambelluri
Browse files

second fix for nbi

parents 4d5be7c3 9eb5fa01

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ include: 
  - local: '/src/opticalcontroller/.gitlab-ci.yml'

  - local: '/src/ztp/.gitlab-ci.yml'

  - local: '/src/policy/.gitlab-ci.yml'

  - local: '/src/automation/.gitlab-ci.yml'

  #- local: '/src/automation/.gitlab-ci.yml'

  - local: '/src/forecaster/.gitlab-ci.yml'

  #- local: '/src/webui/.gitlab-ci.yml'

  #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

deploy/kafka.sh

+5 −4
Original line number Diff line number Diff line
@@ -57,11 +57,12 @@ function kafka_deploy() { 
    # Kafka zookeeper service should be deployed before the kafka service

    kubectl --namespace ${KFK_NAMESPACE} apply -f "${TMP_MANIFESTS_FOLDER}/${KFK_ZOOKEEPER_MANIFEST}"



    KFK_ZOOKEEPER_SERVICE="zookeeper-service"    # this command may be replaced with command to extract service name automatically

    KFK_ZOOKEEPER_IP=$(kubectl --namespace ${KFK_NAMESPACE} get service ${KFK_ZOOKEEPER_SERVICE} -o 'jsonpath={.spec.clusterIP}')

    #KFK_ZOOKEEPER_SERVICE="zookeeper-service"    # this command may be replaced with command to extract service name automatically

    #KFK_ZOOKEEPER_IP=$(kubectl --namespace ${KFK_NAMESPACE} get service ${KFK_ZOOKEEPER_SERVICE} -o 'jsonpath={.spec.clusterIP}')



    # Kafka service should be deployed after the zookeeper service

    sed -i "s/<ZOOKEEPER_INTERNAL_IP>/${KFK_ZOOKEEPER_IP}/" "${TMP_MANIFESTS_FOLDER}/$KFK_MANIFEST"

    #sed -i "s/<ZOOKEEPER_INTERNAL_IP>/${KFK_ZOOKEEPER_IP}/" "${TMP_MANIFESTS_FOLDER}/$KFK_MANIFEST"

    sed -i "s/<KAFKA_NAMESPACE>/${KFK_NAMESPACE}/" "${TMP_MANIFESTS_FOLDER}/$KFK_MANIFEST"



    # echo ">>> Deploying Apache Kafka Broker"

    kubectl --namespace ${KFK_NAMESPACE} apply -f "${TMP_MANIFESTS_FOLDER}/$KFK_MANIFEST"

ecoc24

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
src/tests/ecoc24/
 
 No newline at end of file

manifests/e2e_orchestratorservice.yaml

+4 −12
Original line number Diff line number Diff line
@@ -37,18 +37,10 @@ spec: 
          ports:

            - containerPort: 10050

            - containerPort: 9192

            - containerPort: 8761

            - containerPort: 8762

          env:

            - name: LOG_LEVEL

              value: "INFO"

            - name: WS_IP_HOST

              value: "nbiservice.tfs-ip.svc.cluster.local"

            - name: WS_IP_PORT

              value: "8761"

            - name: WS_E2E_HOST

              value: "e2e-orchestratorservice.tfs-e2e.svc.cluster.local"

            - name: WS_E2E_PORT

              value: "8762"

              value: "DEBUG"

          readinessProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:10050"]
@@ -81,5 +73,5 @@ spec: 
      port: 9192

      targetPort: 9192

    - name: ws

      port: 8761

      targetPort: 8761
 
      port: 8762

      targetPort: 8762

manifests/kafka/01-zookeeper.yaml

+4 −6
Original line number Diff line number Diff line
@@ -19,14 +19,13 @@ metadata: 
  labels:

    app: zookeeper-service

  name: zookeeper-service

  namespace: kafka

spec:

  type: NodePort

  type: ClusterIP

  ports:

    - name: zookeeper-port

      port: 2181

      nodePort: 30181

      targetPort: 2181

      #nodePort: 30181

      #targetPort: 2181

  selector:

    app: zookeeper

---
@@ -36,7 +35,6 @@ metadata: 
  labels:

    app: zookeeper

  name: zookeeper

  namespace: kafka

spec:

  replicas: 1

  selector: