Commit 2af19f14 authored by Fotis Soldatos's avatar Fotis Soldatos
Browse files

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

chore(policy): update policy gRPC port name to grpc

See merge request teraflow-h2020/controller!120
parents cfe69c57 66ac2c58

src/policy/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 6060

USER 1001



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

src/policy/src/main/resources/application.yml

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

        host-port: 8080

        container-port: 8080

      grpc-server:

      grpc:

        host-port: 6060

        container-port: 6060

    env:

src/policy/target/kubernetes/kubernetes.yml

+16 −16
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:42:51 +0000

    app.quarkus.io/commit-id: cfe69c57feb1d488c2dda620021e3c62d67fc3d3

    app.quarkus.io/build-timestamp: 2022-07-14 - 07:52:22 +0000

  labels:

    app.kubernetes.io/name: policyservice

    app: policyservice

  name: policyservice

spec:

  ports:

    - name: grpc-server

      port: 6060

      targetPort: 6060

    - name: http

      port: 8080

      targetPort: 8080

    - name: grpc

      port: 6060

      targetPort: 6060

  selector:

    app.kubernetes.io/name: policyservice

  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:42:51 +0000

    app.quarkus.io/commit-id: cfe69c57feb1d488c2dda620021e3c62d67fc3d3

    app.quarkus.io/build-timestamp: 2022-07-14 - 07:52:22 +0000

  labels:

    app: policyservice

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

    metadata:

      annotations:

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

        app.quarkus.io/build-timestamp: 2022-07-13 - 10:42:51 +0000

        app.quarkus.io/commit-id: cfe69c57feb1d488c2dda620021e3c62d67fc3d3

        app.quarkus.io/build-timestamp: 2022-07-14 - 07:52:22 +0000

      labels:

        app: policyservice

        app.kubernetes.io/name: policyservice
@@ -51,12 +51,12 @@ spec: 
              valueFrom:

                fieldRef:

                  fieldPath: metadata.namespace

            - name: CONTEXT_SERVICE_HOST

              value: contextservice

            - name: SERVICE_SERVICE_HOST

              value: serviceservice

            - name: MONITORING_SERVICE_HOST

              value: monitoringservice

            - name: SERVICE_SERVICE_HOST

              value: serviceservice

            - name: CONTEXT_SERVICE_HOST

              value: contextservice

          image: registry.gitlab.com/teraflow-h2020/controller/policy:0.1.0

          imagePullPolicy: Always

          livenessProbe:
@@ -71,12 +71,12 @@ spec: 
            timeoutSeconds: 10

          name: policyservice

          ports:

            - containerPort: 6060

              name: grpc-server

              protocol: TCP

            - containerPort: 8080

              name: http

              protocol: TCP

            - containerPort: 6060

              name: grpc

              protocol: TCP

          readinessProbe:

            failureThreshold: 3

            httpGet: