change secret names

.gitignore

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

.woodpecker.yml

@@ -0,0 +1,30 @@
+steps:
+  build:
+    image: plugins/kaniko
+    settings:
+      repo:
+        from_secret: image_name
+      registry: 
+        from_secret: container_registry
+      tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG}
+      username: 
+        from_secret: container_registry_username
+      password: 
+        from_secret: container_registry_password
+      dockerfile: Dockerfile
+    when:
+      - event: [push, tag]
+
+  deploy:
+    image: portainer/kubectl-shell:latest
+    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
+      - 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

deployment/deploy.yml

@@ -1,141 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  namespace: mainscnt
-  name: deny-all-but-dns
-spec:
-  podSelector:
-    matchLabels: {}
-  policyTypes:
-    - Egress
-    - Ingress
-  egress:
-    - to:
-      - namespaceSelector:
-          matchLabels:
-            kubernetes.io/metadata.name: kube-system
-      ports:
-        - protocol: UDP
-          port: 53
-        - protocol: TCP
-          port: 53
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: sinkserver
-  namespace: mainscnt
-  labels:
-    app: sinkserver
-spec:
-  replicas: 3
-  selector:
-    matchLabels:
-      app: sinkserver
-  template:
-    metadata:
-      labels:
-        app: sinkserver
-    spec:
-      containers:
-        - name: sinkserver
-          image: wollud1969/sinkserver:e5f9d3e3
-          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
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: allow-database-sinkserver
-  namespace: database
-spec:
-  podSelector:
-    matchLabels:
-      app: timescaledb
-  policyTypes:
-    - Ingress
-  ingress:
-    - from:
-      - podSelector:
-          matchLabels:
-            app: sinkserver
-      - namespaceSelector:
-          matchLabels:
-            kubernetes.io/metadata.name: mainscnt
-      ports:
-        - protocol: TCP
-          port: 5432
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: allow-sinkserver-database
-  namespace: mainscnt
-spec:
-  podSelector:
-    matchLabels:
-      app: sinkserver
-  policyTypes:
-    - Egress
-  egress:
-    - to:
-      - podSelector:
-          matchLabels:
-            app: timescaledb
-      - namespaceSelector:
-          matchLabels:
-            kubernetes.io/metadata.name: database
-      ports:
-        - protocol: TCP
-          port: 5432
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: allow-sinkserver-ingress
-  namespace: mainscnt
-spec:
-  podSelector:
-    matchLabels:
-      app: sinkserver
-  policyTypes:
-    - Ingress
-  ingress:
-    - from:
-      - ipBlock:
-          cidr: 0.0.0.0/0
-      ports:
-        - protocol: UDP
-          port: 20169
-
-
-
-

deployment/namespace.yml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mainscnt

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");