Resolve "(CTTC) Implement integration test between E2E-IP-Optical SDN Controllers"

Closes #216 (closed)

Merge request reports

Loading
+4 −3
Changes for deploy/kafka.sh: 4 added lines, 3 removed lines.
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"
+0 −4
Changes for deploy/tfs.sh: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -342,11 +342,7 @@ for COMPONENT in $TFS_COMPONENTS; do
        sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-gateway:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"
    else
        VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f4)
        if [ "$TFS_SKIP_BUILD" != "YES" ]; then
        IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
        else
            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT:$VERSION" | sed 's,//,/,g' | sed 's,http:/,,g')
        fi
        sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"
    fi

+3 −5
Changes for manifests/kafka/01-zookeeper.yaml: 3 added lines, 5 removed lines.
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:
+3 −4
Changes for manifests/kafka/02-kafka.yaml: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ metadata:
  labels:
    app: kafka-broker
  name: kafka-service
  namespace: kafka
spec:
  ports:
  - port: 9092
@@ -32,7 +31,6 @@ metadata:
  labels:
    app: kafka-broker
  name: kafka-broker
  namespace: kafka
spec:
  replicas: 1
  selector:
@@ -49,11 +47,12 @@ spec:
        - name: KAFKA_BROKER_ID
          value: "1"
        - name: KAFKA_ZOOKEEPER_CONNECT
          value: <ZOOKEEPER_INTERNAL_IP>:2181
          #value: <ZOOKEEPER_INTERNAL_IP>:2181
          value: zookeeper-service.<KAFKA_NAMESPACE>.svc.cluster.local:2181
        - name: KAFKA_LISTENERS
          value: PLAINTEXT://:9092
        - name: KAFKA_ADVERTISED_LISTENERS
          value: PLAINTEXT://kafka-service.kafka.svc.cluster.local:9092
          value: PLAINTEXT://kafka-service.<KAFKA_NAMESPACE>.svc.cluster.local:9092
        image: wurstmeister/kafka
        imagePullPolicy: IfNotPresent
        name: kafka-broker
+4 −2
Changes for manifests/nats/cluster.yaml: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -31,8 +31,10 @@ container:

config:
  cluster:
    enabled: true
    replicas: 3
    #enabled: true
    enabled: false
    #replicas: 3
    replicas: 1
  jetstream:
    enabled: true
    fileStore:
Loading
Loading