code beautify

.gitignore

@@ -8,4 +8,6 @@ test
 .vscode
 .dccache
 sink/.dccache
+*~
+.*~
 

.woodpecker.yml

@@ -2,13 +2,15 @@ steps:
   build:
     image: plugins/kaniko
     settings:
-      repo: gitea.hottis.de/${CI_REPO}
-      registry: https://gitea.hottis.de/v2/
+      repo:
+        from_secret: image_name
+      registry: 
+        from_secret: container_registry
       tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG}
       username: 
-        from_secret: system_container_registry_username
+        from_secret: container_registry_username
       password: 
-        from_secret: system_container_registry_password
+        from_secret: container_registry_password
       dockerfile: Dockerfile
     when:
       - event: [push, tag]
@@ -18,11 +20,11 @@ steps:
     secrets:
       - source: kube_config
         target: KUBE_CONFIG_CONTENT
+      - source: image_name
+        target: IMAGE_NAME
     commands:
       - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
       - export KUBECONFIG=/tmp/kubeconfig
-      - cd ${CI_WORKSPACE}
-      - cat deploy-yml.tmpl | sed -e 's,%IMAGE%,gitea.hottis.de/'${CI_REPO}':'${CI_COMMIT_TAG}',' > deploy.yml
-      - cat deploy.yml
+      - cat $CI_WORKSPACE/deployment/deploy-yml.tmpl | sed -e 's,%IMAGE%,'$IMAGE_NAME':'$CI_COMMIT_TAG',' | kubectl apply -f - 
     when:
       - event: tag

deployment/deploy-yml.tmpl

@@ -0,0 +1,50 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: sinkserver
+  namespace: mainscnt
+  labels:
+    app: sinkserver
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: sinkserver
+  template:
+    metadata:
+      labels:
+        app: sinkserver
+    spec:
+      containers:
+        - name: sinkserver
+          image: %IMAGE%
+          ports:
+            - containerPort: 20169
+              protocol: UDP
+          env:
+            - name: PGHOST
+              valueFrom: 
+                configMapKeyRef:
+                  name: sinkserver-config
+                  key: dbhost
+            - name: PGPASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: sinkserver-secret
+                  key: dbpass
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: sinkserver
+  namespace: mainscnt
+  labels:
+    app: sinkserver
+spec:
+  type: LoadBalancer
+  selector:
+    app: sinkserver
+  ports:
+    - protocol: UDP
+      port: 20169
+      targetPort: 20169

readme.md

@@ -33,3 +33,4 @@ The projects of the three current variants are at [RPi](https://home.hottis.de/g
 
 
 
+

sink/sink20169.c

@@ -301,7 +301,7 @@ void usage() {
     printf("https://home.hottis.de/gitlab/wolutator/mains-frequency-counter-rpi,\n");
     printf("https://github.com/wollud1969/sinkConvert1\n");
     printf("Repo: https://home.hottis.de/gitlab/wolutator/sinkserver\n");
-    printf("Version: " VERSION "\n");
+    printf("Version: " VERSION " XXX\n");
     printf("\nUsage\n");
     printf("  -f FILENAME ...... Config file to be used\n");
     printf("  -v ............... Verbose, writes all logging on stdout too\n");