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

Merge branch 'update_application_files' into 'develop' 

Update policy/automation application.yml files

See merge request !86
parents c39b0232 75ee095f

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

+10 −5
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ quarkus: 
    group: tfs

    name: controller/automation

    registry: labs.etsi.org:5050

    tag: 0.2.0



  kubernetes:

    name: automationservice
@@ -51,12 +52,16 @@ quarkus: 
      period: 10s

    ports:

      http:

        host-port: 8080

        host-port: 9192

        container-port: 8080

      grpc:

        host-port: 5050

        container-port: 5050

    env:

      vars:

        context-service-host: "contextservice"

        device-service-host: "deviceservice"

    resources:

      requests:

        cpu: 50m

        memory: 512Mi

      limits:

        cpu: 500m

        memory: 2048Mi

src/automation/target/kubernetes/kubernetes.yml

+30 −36
Original line number Diff line number Diff line
@@ -11,26 +11,29 @@ 
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



---

apiVersion: v1

kind: Service

metadata:

  annotations:

    app.quarkus.io/build-timestamp: 2022-09-19 - 10:48:18 +0000

    app.quarkus.io/commit-id: 23832f2975e3c8967e9685f7e3a5f5458d04527a

    app.quarkus.io/build-timestamp: 2023-04-04 - 11:47:48 +0000

    prometheus.io/scrape: "true"

    prometheus.io/path: /q/metrics

    prometheus.io/port: "8080"

    prometheus.io/scheme: http

  labels:

    app.kubernetes.io/name: automationservice

    app: automationservice

  name: automationservice

spec:

  ports:

    - name: grpc

      port: 5050

      targetPort: 5050

    - name: metrics

      protocol: TCP

    - name: http

      port: 9192

      targetPort: 8080

    - name: grpc-server

      port: 5050

      targetPort: 5050

  selector:

    app.kubernetes.io/name: automationservice

  type: ClusterIP
@@ -39,7 +42,12 @@ apiVersion: apps/v1 
kind: Deployment

metadata:

  annotations:

    app.quarkus.io/build-timestamp: 2022-09-19 - 10:48:18 +0000

    app.quarkus.io/commit-id: 23832f2975e3c8967e9685f7e3a5f5458d04527a

    app.quarkus.io/build-timestamp: 2023-04-04 - 11:47:48 +0000

    prometheus.io/scrape: "true"

    prometheus.io/path: /q/metrics

    prometheus.io/port: "8080"

    prometheus.io/scheme: http

  labels:

    app: automationservice

    app.kubernetes.io/name: automationservice
@@ -52,7 +60,12 @@ spec: 
  template:

    metadata:

      annotations:

        app.quarkus.io/build-timestamp: 2022-09-19 - 10:48:18 +0000

        app.quarkus.io/commit-id: 23832f2975e3c8967e9685f7e3a5f5458d04527a

        app.quarkus.io/build-timestamp: 2023-04-04 - 11:47:48 +0000

        prometheus.io/scrape: "true"

        prometheus.io/path: /q/metrics

        prometheus.io/port: "8080"

        prometheus.io/scheme: http

      labels:

        app: automationservice

        app.kubernetes.io/name: automationservice
@@ -81,11 +94,11 @@ spec: 
            timeoutSeconds: 10

          name: automationservice

          ports:

            - containerPort: 5050

              name: grpc

              protocol: TCP

            - containerPort: 8080

              name: metrics

              name: http

              protocol: TCP

            - containerPort: 5050

              name: grpc-server

              protocol: TCP

          readinessProbe:

            failureThreshold: 3
@@ -98,28 +111,9 @@ spec: 
            successThreshold: 1

            timeoutSeconds: 10

          resources:

            requests:

              cpu: 50m

              memory: 512Mi

            limits:

              cpu: 500m

              memory: 2048Mi

---

apiVersion: autoscaling/v2

kind: HorizontalPodAutoscaler

metadata:

  name: automationservice-hpa

spec:

  scaleTargetRef:

    apiVersion: apps/v1

    kind: Deployment

    name: automationservice

  minReplicas: 1

  maxReplicas: 10

  metrics:

  - type: Resource

    resource:

      name: cpu

      target:

        type: Utilization

        averageUtilization: 80
 
            requests:

              cpu: 50m

              memory: 512Mi

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

+9 −4
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ quarkus: 
    group: tfs

    name: controller/policy

    registry: labs.etsi.org:5050

    tag: 0.1.0



  kubernetes:

    name: policyservice
@@ -52,14 +53,18 @@ quarkus: 
      period: 10s

    ports:

      http:

        host-port: 8080

        host-port: 9192

        container-port: 8080

      grpc:

        host-port: 6060

        container-port: 6060

    env:

      vars:

        context-service-host: "contextservice"

        monitoring-service-host: "monitoringservice"

        service-service-host: "serviceservice"

    resources:

      requests:

        cpu: 50m

        memory: 512Mi

      limits:

        cpu: 500m

        memory: 2048Mi

src/policy/target/kubernetes/kubernetes.yml

+29 −37
Original line number Diff line number Diff line
@@ -11,24 +11,27 @@ 
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



---

apiVersion: v1

kind: Service

metadata:

  annotations:

    app.quarkus.io/commit-id: 8065cee75be759e14af792737179537096de5e11

    app.quarkus.io/build-timestamp: 2023-03-30 - 13:49:59 +0000

    app.quarkus.io/commit-id: 23832f2975e3c8967e9685f7e3a5f5458d04527a

    app.quarkus.io/build-timestamp: 2023-04-04 - 11:56:04 +0000

    prometheus.io/scrape: "true"

    prometheus.io/path: /q/metrics

    prometheus.io/port: "8080"

    prometheus.io/scheme: http

  labels:

    app.kubernetes.io/name: policyservice

    app: policyservice

  name: policyservice

spec:

  ports:

    - name: metrics

    - name: http

      port: 9192

      targetPort: 8080

    - name: grpc

    - name: grpc-server

      port: 6060

      targetPort: 6060

  selector:
@@ -39,8 +42,12 @@ apiVersion: apps/v1 
kind: Deployment

metadata:

  annotations:

    app.quarkus.io/commit-id: 8065cee75be759e14af792737179537096de5e11

    app.quarkus.io/build-timestamp: 2023-03-30 - 13:49:59 +0000

    app.quarkus.io/commit-id: 23832f2975e3c8967e9685f7e3a5f5458d04527a

    app.quarkus.io/build-timestamp: 2023-04-04 - 11:56:04 +0000

    prometheus.io/scrape: "true"

    prometheus.io/path: /q/metrics

    prometheus.io/port: "8080"

    prometheus.io/scheme: http

  labels:

    app: policyservice

    app.kubernetes.io/name: policyservice
@@ -53,8 +60,12 @@ spec: 
  template:

    metadata:

      annotations:

        app.quarkus.io/commit-id: 8065cee75be759e14af792737179537096de5e11

        app.quarkus.io/build-timestamp: 2023-03-30 - 13:49:59 +0000

        app.quarkus.io/commit-id: 23832f2975e3c8967e9685f7e3a5f5458d04527a

        app.quarkus.io/build-timestamp: 2023-04-04 - 11:56:04 +0000

        prometheus.io/scrape: "true"

        prometheus.io/path: /q/metrics

        prometheus.io/port: "8080"

        prometheus.io/scheme: http

      labels:

        app: policyservice

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

                fieldRef:

                  fieldPath: metadata.namespace

            - name: SERVICE_SERVICE_HOST

              value: serviceservice

            - name: CONTEXT_SERVICE_HOST

              value: contextservice

            - name: MONITORING_SERVICE_HOST

              value: monitoringservice

            - name: CONTEXT_SERVICE_HOST

              value: contextservice

            - name: SERVICE_SERVICE_HOST

              value: serviceservice

          image: labs.etsi.org:5050/tfs/controller/policy:0.1.0

          imagePullPolicy: Always

          livenessProbe:
@@ -86,7 +97,7 @@ spec: 
          name: policyservice

          ports:

            - containerPort: 8080

              name: metrics

              name: http

              protocol: TCP

            - containerPort: 6060

              name: grpc-server
@@ -102,28 +113,9 @@ spec: 
            successThreshold: 1

            timeoutSeconds: 10

          resources:

            requests:

              cpu: 50m

              memory: 512Mi

            limits:

              cpu: 500m

              memory: 2048Mi

---

apiVersion: autoscaling/v2

kind: HorizontalPodAutoscaler

metadata:

  name: policyservice-hpa

spec:

  scaleTargetRef:

    apiVersion: apps/v1

    kind: Deployment

    name: policyservice

  minReplicas: 1

  maxReplicas: 10

  metrics:

  - type: Resource

    resource:

      name: cpu

      target:

        type: Utilization

        averageUtilization: 80
 
 No newline at end of file
 
            requests:

              cpu: 50m

              memory: 512Mi