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

Code cleanup

parent 9599f283

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

manifests/webuiservice.yaml

+49 −49
Original line number Diff line number Diff line
@@ -72,51 +72,51 @@ spec: 
            limits:

              cpu: 1000m

              memory: 1024Mi

        - name: grafana

          image: grafana/grafana:8.5.22

          imagePullPolicy: IfNotPresent

          ports:

            - containerPort: 3000

              name: http-grafana

              protocol: TCP

          env:

            - name: GF_SERVER_ROOT_URL

              value: "http://0.0.0.0:3000/grafana/"

            - name: GF_SERVER_SERVE_FROM_SUB_PATH

              value: "true"

          readinessProbe:

            failureThreshold: 60

            httpGet:

              #path: /robots.txt

              path: /login

              port: 3000

              scheme: HTTP

            initialDelaySeconds: 1

            periodSeconds: 1

            successThreshold: 1

            timeoutSeconds: 2

          livenessProbe:

            failureThreshold: 60

            initialDelaySeconds: 1

            periodSeconds: 1

            successThreshold: 1

            tcpSocket:

              port: 3000

            timeoutSeconds: 1

          resources:

            requests:

              cpu: 250m

              memory: 512Mi

            limits:

              cpu: 500m

              memory: 1024Mi

          volumeMounts:

            - mountPath: /var/lib/grafana

              name: grafana-pv

      volumes:

        - name: grafana-pv

          persistentVolumeClaim:

            claimName: grafana-pvc

        #- name: grafana

        #  image: grafana/grafana:8.5.22

        #  imagePullPolicy: IfNotPresent

        #  ports:

        #    - containerPort: 3000

        #      name: http-grafana

        #      protocol: TCP

        #  env:

        #    - name: GF_SERVER_ROOT_URL

        #      value: "http://0.0.0.0:3000/grafana/"

        #    - name: GF_SERVER_SERVE_FROM_SUB_PATH

        #      value: "true"

        #  readinessProbe:

        #    failureThreshold: 60

        #    httpGet:

        #      #path: /robots.txt

        #      path: /login

        #      port: 3000

        #      scheme: HTTP

        #    initialDelaySeconds: 1

        #    periodSeconds: 1

        #    successThreshold: 1

        #    timeoutSeconds: 2

        #  livenessProbe:

        #    failureThreshold: 60

        #    initialDelaySeconds: 1

        #    periodSeconds: 1

        #    successThreshold: 1

        #    tcpSocket:

        #      port: 3000

        #    timeoutSeconds: 1

        #  resources:

        #    requests:

        #      cpu: 250m

        #      memory: 512Mi

        #    limits:

        #      cpu: 500m

        #      memory: 1024Mi

        #  volumeMounts:

        #    - mountPath: /var/lib/grafana

        #      name: grafana-pv

      #volumes:

      #  - name: grafana-pv

      #    persistentVolumeClaim:

      #      claimName: grafana-pvc

---

apiVersion: v1

kind: Service
@@ -146,7 +146,7 @@ spec: 
    kind: Deployment

    name: webuiservice

  minReplicas: 1

  maxReplicas: 1

  maxReplicas: 20

  metrics:

    - type: Resource

      resource:

scripts/cockroachdb_client.sh

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ export CRDB_DEPLOY_MODE=${CRDB_DEPLOY_MODE:-"single"} 


if [ "$CRDB_DEPLOY_MODE" == "single" ]; then

    CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

    CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@cockroachdb-0:${CRDB_SQL_PORT}/tfs_context?sslmode=require"

    CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@cockroachdb-0:${CRDB_SQL_PORT}/defaultdb?sslmode=require"

    kubectl exec -it --namespace ${CRDB_NAMESPACE} cockroachdb-0 -- \

        ./cockroach sql --certs-dir=/cockroach/cockroach-certs --url=${CRDB_CLIENT_URL}

elif [ "$CRDB_DEPLOY_MODE" == "cluster" ]; then

scripts/show_logs_context.sh

+1 −1
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"} 
# Automated steps start here

########################################################################################################################



kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server  --insecure-skip-tls-verify
 
kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server