Commit a8326f26 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup

parent 455c8b27

delete_me/Dockerfile

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
# Use the official Ubuntu image from the Docker Hub

FROM ubuntu:latest



# Update and install any required packages



RUN  apt-get update





# Set the working directory

WORKDIR /app



# Copy any necessary files into the working directory

COPY . /app



# Specify the command to run when the container starts

CMD ["echo", "Hello, Docker!"]

deploy/crdb.sh

+5 −5
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ function crdb_deploy_cluster() { 
        sed "s/%TFS_CRDB_NAMESPACE%/${CRDB_NAMESPACE}/g" "${CRDB_MANIFESTS_PATH}/operator.yaml" \

            > "${TMP_MANIFESTS_FOLDER}/crdb_operator.yaml"

        kubectl apply -f "${TMP_MANIFESTS_FOLDER}/crdb_operator.yaml"

        kubectl wait --namespace cockroach-operator-system --for=condition=Available=True --timeout=3600s \

        kubectl wait --namespace cockroach-operator-system --for=condition=Available=True --timeout=300s \

            deployment/cockroach-operator-manager

        #kubectl wait --namespace cockroach-operator-system --for=jsonpath='{.status.readyReplicas}'=1 --timeout=300s \

        #    deployment/cockroach-operator-manager
@@ -264,9 +264,9 @@ function crdb_deploy_cluster() { 
            printf "%c" "."

            sleep 1

        done

        kubectl wait --namespace ${CRDB_NAMESPACE} --for=condition=Ready --timeout=3600s pod/cockroachdb-0

        kubectl wait --namespace ${CRDB_NAMESPACE} --for=condition=Ready --timeout=3600s pod/cockroachdb-1

        kubectl wait --namespace ${CRDB_NAMESPACE} --for=condition=Ready --timeout=3600s pod/cockroachdb-2

        kubectl wait --namespace ${CRDB_NAMESPACE} --for=condition=Ready --timeout=300s pod/cockroachdb-0

        kubectl wait --namespace ${CRDB_NAMESPACE} --for=condition=Ready --timeout=300s pod/cockroachdb-1

        kubectl wait --namespace ${CRDB_NAMESPACE} --for=condition=Ready --timeout=300s pod/cockroachdb-2

    fi

    echo
@@ -278,7 +278,7 @@ function crdb_deploy_cluster() { 
        echo ">>> Deploy CockroachDB Client"

        cp "${CRDB_MANIFESTS_PATH}/client-secure-operator.yaml" "${TMP_MANIFESTS_FOLDER}/crdb_client-secure-operator.yaml"

        kubectl create --namespace ${CRDB_NAMESPACE} -f "${TMP_MANIFESTS_FOLDER}/crdb_client-secure-operator.yaml"

        kubectl wait --namespace ${CRDB_NAMESPACE} --for=condition=Ready --timeout=3600s pod/cockroachdb-client-secure

        kubectl wait --namespace ${CRDB_NAMESPACE} --for=condition=Ready --timeout=300s pod/cockroachdb-client-secure

    fi

    echo

deploy/tfs.sh

+2 −4
Original line number Diff line number Diff line
@@ -197,9 +197,7 @@ kubectl create secret generic redis-secrets --namespace=$TFS_K8S_NAMESPACE \ 
echo "export REDIS_PASSWORD=${REDIS_PASSWORD}" >> $ENV_VARS_SCRIPT

printf "\n"





DOCKER_BUILD="docker build"



DOCKER_MAJOR_VERSION=$(docker --version | grep -o -E "Docker version [0-9]+\." | grep -o -E "[0-9]+" | cut -c 1-3)

if [[ $DOCKER_MAJOR_VERSION -ge 23 ]]; then

    # If Docker version >= 23, build command was migrated to docker-buildx
@@ -212,7 +210,7 @@ if [[ $DOCKER_MAJOR_VERSION -ge 23 ]]; then 
        exit 1;

    fi

   

    DOCKER_BUILD="docker buildx build --network=host "

    DOCKER_BUILD="docker buildx build"

fi



LINKERD_STATUS="$(microk8s status -a linkerd)"

manifests/contextservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ spec: 
            - name: MB_BACKEND

              value: "nats"

            - name: LOG_LEVEL

              value: "DEBUG"

              value: "INFO"

            - name: ALLOW_EXPLICIT_ADD_DEVICE_TO_TOPOLOGY

              value: "FALSE"

            - name: ALLOW_EXPLICIT_ADD_LINK_TO_TOPOLOGY

manifests/sliceservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ spec: 
              command: ["/bin/grpc_health_probe", "-addr=:4040"]

          resources:

            requests:

              cpu: 350m

              cpu: 250m

              memory: 128Mi

            limits:

              cpu: 1000m