From f70e9b31e6500e546ab897eaefb67d7b043e8c65 Mon Sep 17 00:00:00 2001
From: janniswarnat <jannis.warnat@fit.fraunhofer.de>
Date: Mon, 28 Mar 2022 12:34:28 +0200
Subject: [PATCH] compare repos

---
 docker-compose.yml                              | 13 ++++++++-----
 ...ap.yaml => pillar-raspberrypi-configmap.yaml |  2 +-
 pillar-top-configmap.yaml                       |  2 +-
 salt-deployment.yaml                            | 17 +++++++++++++----
 salt-service.yaml                               |  2 ++
 5 files changed, 25 insertions(+), 11 deletions(-)
 rename pillar-raspberry-configmap.yaml => pillar-raspberrypi-configmap.yaml (85%)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8c40508..bdf95c5 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       - "8000:8000"
       - "9000:9000"
       - "1234:1234"
-    entrypoint: ["/bin/sh", "-c" , "mkdir -p /srv/salt && tar -xzvf /tmp/salt-files.tar.gz -C /srv/salt && mkdir -p /etc/salt/pki/master/minions && cp /tmp/docker-salt-minion /etc/salt/pki/master/minions && /usr/bin/supervisord"]
+    entrypoint: ["/bin/sh", "-c" , "mkdir -p /srv/salt && tar -xzvf /tmp/salt-files.tar.gz -C /srv/salt && mkdir -p /etc/salt/pki/master/minions && cp /tmp/docker-salt-minion /etc/salt/pki/master/minions && cp /tmp/raspberrypi /etc/salt/pki/master/minions && /usr/bin/supervisord"]
     configs:
       - source: master-pem
         target: "/etc/salt/pki/master/master.pem"
@@ -16,7 +16,8 @@ services:
         target: "/etc/salt/pki/master/master.pub"
       - source: minion-pub
         target: "/tmp/docker-salt-minion"
-        #target: "/etc/salt/pki/master/minions/docker-salt-minion"
+      - source: raspberrypi-pub
+        target: "/tmp/raspberrypi"
       - source: settings-yml
         target: "/github.com/smart-proxy/config/settings.yml"
       - source: salt-yml
@@ -35,7 +36,7 @@ services:
         target: "/srv/pillar/top.sls"
       - source: pillar-default
         target: "/srv/pillar/default.sls"
-      - source: pillar-raspberry
+      - source: pillar-raspberrypi
         target: "/srv/pillar/raspberrypi.sls"
     environment:
       - SALT_SHARED_SECRET=GCUrcjS8J5wrcdtbWpjV
@@ -101,6 +102,8 @@ configs:
     file: "./etc_master/salt/pki/master/master.pem"
   master-pub:
     file: "./etc_master/salt/pki/master/master.pub"
+  raspberrypi-pub:
+    file: "./etc_master/salt/pki/master/minions/raspberrypi"
   minion:
     file: "./etc_minion/salt/minion"
   settings-yml:
@@ -121,5 +124,5 @@ configs:
     file: "./srv/pillar/top.sls"
   pillar-default:
     file: "./srv/pillar/default.sls"
-  pillar-raspberry:
-    file: "./srv/pillar/raspberrypi.sls"
+  pillar-raspberrypi:
+    file: "./srv/pillar/raspberrypi.sls"
\ No newline at end of file
diff --git a/pillar-raspberry-configmap.yaml b/pillar-raspberrypi-configmap.yaml
similarity index 85%
rename from pillar-raspberry-configmap.yaml
rename to pillar-raspberrypi-configmap.yaml
index 03542f3..0c666b9 100755
--- a/pillar-raspberry-configmap.yaml
+++ b/pillar-raspberrypi-configmap.yaml
@@ -8,4 +8,4 @@ metadata:
   creationTimestamp: null
   labels:
     io.kompose.service: salt
-  name: pillar-raspberry
+  name: pillar-raspberrypi
diff --git a/pillar-top-configmap.yaml b/pillar-top-configmap.yaml
index 873c05f..079f1ca 100755
--- a/pillar-top-configmap.yaml
+++ b/pillar-top-configmap.yaml
@@ -4,7 +4,7 @@ data:
     base:
       '*':
         - default
-      '*raspberry*':
+      '*raspberrypi*':
         - raspberrypi
       '*linksmart*':
         - raspberrypi
diff --git a/salt-deployment.yaml b/salt-deployment.yaml
index f1b2309..58d6975 100755
--- a/salt-deployment.yaml
+++ b/salt-deployment.yaml
@@ -31,7 +31,7 @@ spec:
         - command:
             - /bin/sh
             - -c
-            - mkdir -p /srv/salt && tar -xzvf /tmp/salt-files.tar.gz -C /srv/salt && mkdir -p /etc/salt/pki/master/minions && cp /tmp/docker-salt-minion /etc/salt/pki/master/minions && /usr/bin/supervisord
+            - mkdir -p /srv/salt && tar -xzvf /tmp/salt-files.tar.gz -C /srv/salt && mkdir -p /etc/salt/pki/master/minions && cp /tmp/docker-salt-minion /etc/salt/pki/master/minions && cp /tmp/raspberrypi /etc/salt/pki/master/minions && /usr/bin/supervisord
           env:
             - name: SALT_API_CONFIG
               value: '{ "rest_cherrypy":{ "port":8000, "disable_ssl":true }, "external_auth":{ "sharedsecret":{ "salt":[ ".*", "@wheel", "@jobs", "@runner" ] } }, "sharedsecret":"GCUrcjS8J5wrcdtbWpjV" } '
@@ -58,6 +58,9 @@ spec:
             - mountPath: /tmp/docker-salt-minion
               name: minion-pub
               subPath: docker-salt-minion
+            - mountPath: /tmp/raspberrypi
+              name: raspberrypi-pub
+              subPath: raspberrypi
             - mountPath: /github.com/smart-proxy/config/settings.yml
               name: settings-yml
               subPath: settings.yml
@@ -86,7 +89,7 @@ spec:
               name: pillar-default
               subPath: default.sls
             - mountPath: /srv/pillar/raspberrypi.sls
-              name: pillar-raspberry
+              name: pillar-raspberrypi
               subPath: raspberrypi.sls
       restartPolicy: Always
       volumes:
@@ -108,6 +111,12 @@ spec:
                 path: docker-salt-minion
             name: minion-pub
           name: minion-pub
+        - configMap:
+            items:
+              - key: raspberrypi
+                path: raspberrypi
+            name: raspberrypi-pub
+          name: raspberrypi-pub
         - configMap:
             items:
               - key: settings.yml
@@ -166,6 +175,6 @@ spec:
             items:
               - key: raspberrypi.sls
                 path: raspberrypi.sls
-            name: pillar-raspberry
-          name: pillar-raspberry
+            name: pillar-raspberrypi
+          name: pillar-raspberrypi
 status: {}
diff --git a/salt-service.yaml b/salt-service.yaml
index 37b2ef4..0ac88f8 100755
--- a/salt-service.yaml
+++ b/salt-service.yaml
@@ -15,9 +15,11 @@ spec:
     - name: "4505"
       port: 4505
       targetPort: 4505
+      nodePort: 30001
     - name: "4506"
       port: 4506
       targetPort: 4506
+      nodePort: 30002
     - name: "8000"
       port: 8000
       targetPort: 8000