Commit e8571ade authored by Fotis Soldatos's avatar Fotis Soldatos
Browse files

Merge branch 'automation/update-automation-service-grpc-port-name' into 'develop' 

chore(automation): update gRPC port name to grpc

See merge request teraflow-h2020/controller!121
parents 2af19f14 de181199

src/automation/src/main/docker/Dockerfile.multistage.jvm

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ COPY --from=builder --chown=1001 /app/target/quarkus-app/app/ /deployments/app/ 
COPY --from=builder --chown=1001 /app/target/quarkus-app/quarkus/ /deployments/quarkus/



EXPOSE 8080

EXPOSE 9999

EXPOSE 5050

USER 1001



ENTRYPOINT [ "/deployments/run-java.sh" ]

src/automation/src/main/resources/application.yml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ quarkus: 
      http:

        host-port: 8080

        container-port: 8080

      grpc-server:

      grpc:

        host-port: 5050

        container-port: 5050

    env:

src/automation/target/kubernetes/kubernetes.yml

+12 −12
Original line number Diff line number Diff line
@@ -3,20 +3,20 @@ apiVersion: v1 
kind: Service

metadata:

  annotations:

    app.quarkus.io/commit-id: 665bca2f1245843e8c99eaa1a2c5315a6c002417

    app.quarkus.io/build-timestamp: 2022-07-13 - 10:46:17 +0000

    app.quarkus.io/commit-id: cfe69c57feb1d488c2dda620021e3c62d67fc3d3

    app.quarkus.io/build-timestamp: 2022-07-14 - 07:57:09 +0000

  labels:

    app.kubernetes.io/name: automationservice

    app: automationservice

  name: automationservice

spec:

  ports:

    - name: grpc-server

      port: 5050

      targetPort: 5050

    - name: http

      port: 8080

      targetPort: 8080

    - name: grpc

      port: 5050

      targetPort: 5050

  selector:

    app.kubernetes.io/name: automationservice

  type: ClusterIP
@@ -25,8 +25,8 @@ apiVersion: apps/v1 
kind: Deployment

metadata:

  annotations:

    app.quarkus.io/commit-id: 665bca2f1245843e8c99eaa1a2c5315a6c002417

    app.quarkus.io/build-timestamp: 2022-07-13 - 10:46:17 +0000

    app.quarkus.io/commit-id: cfe69c57feb1d488c2dda620021e3c62d67fc3d3

    app.quarkus.io/build-timestamp: 2022-07-14 - 07:57:09 +0000

  labels:

    app: automationservice

    app.kubernetes.io/name: automationservice
@@ -39,8 +39,8 @@ spec: 
  template:

    metadata:

      annotations:

        app.quarkus.io/commit-id: 665bca2f1245843e8c99eaa1a2c5315a6c002417

        app.quarkus.io/build-timestamp: 2022-07-13 - 10:46:17 +0000

        app.quarkus.io/commit-id: cfe69c57feb1d488c2dda620021e3c62d67fc3d3

        app.quarkus.io/build-timestamp: 2022-07-14 - 07:57:09 +0000

      labels:

        app: automationservice

        app.kubernetes.io/name: automationservice
@@ -69,12 +69,12 @@ spec: 
            timeoutSeconds: 10

          name: automationservice

          ports:

            - containerPort: 5050

              name: grpc-server

              protocol: TCP

            - containerPort: 8080

              name: http

              protocol: TCP

            - containerPort: 5050

              name: grpc

              protocol: TCP

          readinessProbe:

            failureThreshold: 3

            httpGet: