fix: fix kubernetes.yml files for ztp and policy (205d8ef8) · Commits · TFS / controller

src/policy/target/kubernetes/kubernetes.yml

+39 −28

Original line number	Diff line number	Diff line
		@@ -3,61 +3,59 @@ apiVersion: v1
		kind: Service
		metadata:
		annotations:
		app.quarkus.io/commit-id: f75e466c51bdad466bcf28acffd06f5a56f75539
		app.quarkus.io/build-timestamp: 2023-12-08 - 14:19:04 +0000
		app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2
		app.quarkus.io/build-timestamp: 2023-12-15 - 11:56:20 +0000
		prometheus.io/scrape: "true"
		prometheus.io/path: /q/metrics
		prometheus.io/port: "8080"
		prometheus.io/scheme: http
		labels:
		app.kubernetes.io/name: policy
		app.kubernetes.io/version: 0.1.0
		name: policy
		app.kubernetes.io/name: policyservice
		app: policyservice
		name: policyservice
		spec:
		ports:
		- name: grpc-server
		port: 9000
		targetPort: 9000
		port: 6060
		targetPort: 6060
		- name: http
		port: 80
		port: 9192
		targetPort: 8080
		selector:
		app.kubernetes.io/name: policy
		app.kubernetes.io/version: 0.1.0
		app.kubernetes.io/name: policyservice
		type: ClusterIP
		---
		apiVersion: apps/v1
		kind: Deployment
		metadata:
		annotations:
		app.quarkus.io/commit-id: f75e466c51bdad466bcf28acffd06f5a56f75539
		app.quarkus.io/build-timestamp: 2023-12-08 - 14:19:04 +0000
		app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2
		app.quarkus.io/build-timestamp: 2023-12-15 - 11:56:20 +0000
		prometheus.io/scrape: "true"
		prometheus.io/path: /q/metrics
		prometheus.io/port: "8080"
		prometheus.io/scheme: http
		labels:
		app.kubernetes.io/version: 0.1.0
		app.kubernetes.io/name: policy
		name: policy
		app: policyservice
		app.kubernetes.io/name: policyservice
		name: policyservice
		spec:
		replicas: 1
		selector:
		matchLabels:
		app.kubernetes.io/version: 0.1.0
		app.kubernetes.io/name: policy
		app.kubernetes.io/name: policyservice
		template:
		metadata:
		annotations:
		app.quarkus.io/commit-id: f75e466c51bdad466bcf28acffd06f5a56f75539
		app.quarkus.io/build-timestamp: 2023-12-08 - 14:19:04 +0000
		app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2
		app.quarkus.io/build-timestamp: 2023-12-15 - 11:56:20 +0000
		prometheus.io/scrape: "true"
		prometheus.io/path: /q/metrics
		prometheus.io/port: "8080"
		prometheus.io/scheme: http
		labels:
		app.kubernetes.io/version: 0.1.0
		app.kubernetes.io/name: policy
		app: policyservice
		app.kubernetes.io/name: policyservice
		spec:
		containers:
		- env:
		@@ -65,7 +63,13 @@ spec:
		valueFrom:
		fieldRef:
		fieldPath: metadata.namespace
		image: nuc8/policy:0.1.0
		- name: CONTEXT_SERVICE_HOST
		value: contextservice
		- name: MONITORING_SERVICE_HOST
		value: monitoringservice
		- name: SERVICE_SERVICE_HOST
		value: serviceservice
		image: labs.etsi.org:5050/tfs/controller/policy:0.1.0
		imagePullPolicy: Always
		livenessProbe:
		failureThreshold: 3
		@@ -73,13 +77,13 @@ spec:
		path: /q/health/live
		port: 8080
		scheme: HTTP
		initialDelaySeconds: 0
		periodSeconds: 30
		initialDelaySeconds: 2
		periodSeconds: 10
		successThreshold: 1
		timeoutSeconds: 10
		name: policy
		name: policyservice
		ports:
		- containerPort: 9000
		- containerPort: 6060
		name: grpc-server
		protocol: TCP
		- containerPort: 8080
		@@ -91,7 +95,14 @@ spec:
		path: /q/health/ready
		port: 8080
		scheme: HTTP
		initialDelaySeconds: 0
		periodSeconds: 30
		initialDelaySeconds: 2
		periodSeconds: 10
		successThreshold: 1
		timeoutSeconds: 10
		resources:
		limits:
		cpu: 500m
		memory: 2048Mi
		requests:
		cpu: 50m
		memory: 512Mi

src/ztp/target/kubernetes/kubernetes.yml

+14 −14

Original line number	Diff line number	Diff line
		@@ -3,8 +3,8 @@ apiVersion: v1
		kind: Service
		metadata:
		annotations:
		app.quarkus.io/commit-id: daed600da1c35d66317293d78bfe3cc6b69cff43
		app.quarkus.io/build-timestamp: 2023-12-08 - 14:17:19 +0000
		app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2
		app.quarkus.io/build-timestamp: 2023-12-15 - 12:04:12 +0000
		prometheus.io/scrape: "true"
		prometheus.io/path: /q/metrics
		prometheus.io/port: "8080"
		@@ -15,12 +15,12 @@ metadata:
		name: ztpservice
		spec:
		ports:
		- name: http
		port: 9192
		targetPort: 8080
		- name: grpc-server
		port: 5050
		targetPort: 5050
		- name: http
		port: 9192
		targetPort: 8080
		selector:
		app.kubernetes.io/name: ztpservice
		type: ClusterIP
		@@ -29,8 +29,8 @@ apiVersion: apps/v1
		kind: Deployment
		metadata:
		annotations:
		app.quarkus.io/commit-id: daed600da1c35d66317293d78bfe3cc6b69cff43
		app.quarkus.io/build-timestamp: 2023-12-08 - 14:17:19 +0000
		app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2
		app.quarkus.io/build-timestamp: 2023-12-15 - 12:04:12 +0000
		prometheus.io/scrape: "true"
		prometheus.io/path: /q/metrics
		prometheus.io/port: "8080"
		@@ -47,8 +47,8 @@ spec:
		template:
		metadata:
		annotations:
		app.quarkus.io/commit-id: daed600da1c35d66317293d78bfe3cc6b69cff43
		app.quarkus.io/build-timestamp: 2023-12-08 - 14:17:19 +0000
		app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2
		app.quarkus.io/build-timestamp: 2023-12-15 - 12:04:12 +0000
		prometheus.io/scrape: "true"
		prometheus.io/path: /q/metrics
		prometheus.io/port: "8080"
		@@ -63,10 +63,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: labs.etsi.org:5050/tfs/controller/ztp:0.2.0
		imagePullPolicy: Always
		livenessProbe:
		@@ -81,12 +81,12 @@ spec:
		timeoutSeconds: 10
		name: ztpservice
		ports:
		- containerPort: 8080
		name: http
		protocol: TCP
		- containerPort: 5050
		name: grpc-server
		protocol: TCP
		- containerPort: 8080
		name: http
		protocol: TCP
		readinessProbe:
		failureThreshold: 3
		httpGet: