Commit feb80993 authored by Chris Aslanoglou's avatar Chris Aslanoglou
Browse files

Merge branch 'chore/automation-disable-version-from-pod-selector' into 'develop' 

chore/automation disable version from pod selector

See merge request teraflow-h2020/controller!83
parents 974fc4a4 093b7d2c

src/automation/.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ deploy automation: 
  script:

    - kubectl version

    - kubectl get all

    - kubectl delete -f "manifests/automationservice.yaml"

    - kubectl apply -f "manifests/automationservice.yaml"

    - kubectl delete pods --selector app=automationservice

    - kubectl get all

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

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ quarkus: 
    image-pull-policy: Always

    labels:

      app: automationservice

    add-version-to-label-selectors: false

    readiness-probe:

      initial-delay: 2s

      period: 10s

src/automation/target/kubernetes/kubernetes.yml

+14 −19
Original line number Diff line number Diff line
@@ -3,51 +3,46 @@ apiVersion: v1 
kind: Service

metadata:

  annotations:

    app.quarkus.io/commit-id: 1d9391e04561028e64164362c608dfd97a869928

    app.quarkus.io/build-timestamp: 2022-02-10 - 12:24:30 +0000

    app.quarkus.io/commit-id: 500a0a232ec361b669b48cc432e9bd9c332eae8b

    app.quarkus.io/build-timestamp: 2022-02-11 - 10:27:21 +0000

  labels:

    app.kubernetes.io/name: automationservice

    app.kubernetes.io/version: 0.1.0

    app: automationservice

  name: automationservice

spec:

  ports:

    - name: http

      port: 8080

      targetPort: 8080

    - name: grpc-server

      port: 9999

      targetPort: 9999

    - name: http

      port: 8080

      targetPort: 8080

  selector:

    app.kubernetes.io/name: automationservice

    app.kubernetes.io/version: 0.1.0

  type: ClusterIP

---

apiVersion: apps/v1

kind: Deployment

metadata:

  annotations:

    app.quarkus.io/commit-id: 1d9391e04561028e64164362c608dfd97a869928

    app.quarkus.io/build-timestamp: 2022-02-10 - 12:24:30 +0000

    app.quarkus.io/commit-id: 500a0a232ec361b669b48cc432e9bd9c332eae8b

    app.quarkus.io/build-timestamp: 2022-02-11 - 10:27:21 +0000

  labels:

    app: automationservice

    app.kubernetes.io/version: 0.1.0

    app.kubernetes.io/name: automationservice

  name: automationservice

spec:

  replicas: 1

  selector:

    matchLabels:

      app.kubernetes.io/version: 0.1.0

      app.kubernetes.io/name: automationservice

  template:

    metadata:

      annotations:

        app.quarkus.io/commit-id: 1d9391e04561028e64164362c608dfd97a869928

        app.quarkus.io/build-timestamp: 2022-02-10 - 12:24:30 +0000

        app.quarkus.io/commit-id: 500a0a232ec361b669b48cc432e9bd9c332eae8b

        app.quarkus.io/build-timestamp: 2022-02-11 - 10:27:21 +0000

      labels:

        app: automationservice

        app.kubernetes.io/version: 0.1.0

        app.kubernetes.io/name: automationservice

    spec:

      containers:
@@ -56,10 +51,10 @@ spec: 
              valueFrom:

                fieldRef:

                  fieldPath: metadata.namespace

            - name: DEVICE_SERVICE_HOST

              value: deviceservice

            - name: CONTEXT_SERVICE_HOST

              value: contextservice

            - name: DEVICE_SERVICE_HOST

              value: deviceservice

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

          imagePullPolicy: Always

          livenessProbe:
@@ -74,12 +69,12 @@ spec: 
            timeoutSeconds: 10

          name: automationservice

          ports:

            - containerPort: 8080

              name: http

              protocol: TCP

            - containerPort: 9999

              name: grpc-server

              protocol: TCP

            - containerPort: 8080

              name: http

              protocol: TCP

          readinessProbe:

            failureThreshold: 3

            httpGet: