Fix/default vpn/nets (#283)

* fix(vpn.jenkins.io) cleanup netmask and unused networks Signed-off-by: Damien Duportal <damien.duportal@gmail.com> * cleanup(vpn.jenkins.io) removed unused accounts Signed-off-by: Damien Duportal <damien.duportal@gmail.com> * cleanup(tests) update setups Signed-off-by: Damien Duportal <damien.duportal@gmail.com> --------- Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
jenkins-infra · Jun 24, 2023 · 1e001ef · 1e001ef
1 parent 31faee1
commit 1e001ef
Show file tree

Hide file tree

Showing 33 changed files with 23 additions and 69 deletions.
diff --git a/cert/ccd/default/abayer b/cert/ccd/default/abayer
diff --git a/cert/ccd/default/aheritier b/cert/ccd/default/aheritier
diff --git a/cert/ccd/default/alecharp b/cert/ccd/default/alecharp
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.29 255.255.254.0
+ifconfig-push 10.8.0.29 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/basil b/cert/ccd/default/basil
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.25 255.255.254.0
+ifconfig-push 10.8.0.25 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/danielbeck b/cert/ccd/default/danielbeck
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.4 255.255.254.0
+ifconfig-push 10.8.0.4 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/dduportal b/cert/ccd/default/dduportal
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.5 255.255.254.0
+ifconfig-push 10.8.0.5 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/dnusbaum b/cert/ccd/default/dnusbaum
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.28 255.255.254.0
+ifconfig-push 10.8.0.28 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/garethjevans b/cert/ccd/default/garethjevans
diff --git a/cert/ccd/default/halkeye b/cert/ccd/default/halkeye
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.7 255.255.254.0
+ifconfig-push 10.8.0.7 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/hlemeur b/cert/ccd/default/hlemeur
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.8 255.255.254.0
+ifconfig-push 10.8.0.8 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/imontero b/cert/ccd/default/imontero
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.23 255.255.254.0
+ifconfig-push 10.8.0.23 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/jequals5 b/cert/ccd/default/jequals5
diff --git a/cert/ccd/default/jthompson b/cert/ccd/default/jthompson
diff --git a/cert/ccd/default/jvz b/cert/ccd/default/jvz
diff --git a/cert/ccd/default/kevingrdj b/cert/ccd/default/kevingrdj
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.12 255.255.254.0
+ifconfig-push 10.8.0.12 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/markewaite b/cert/ccd/default/markewaite
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.13 255.255.254.0
+ifconfig-push 10.8.0.13 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/mpapo b/cert/ccd/default/mpapo
diff --git a/cert/ccd/default/notmyfault b/cert/ccd/default/notmyfault
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.24 255.255.254.0
+ifconfig-push 10.8.0.24 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/olblak b/cert/ccd/default/olblak
diff --git a/cert/ccd/default/oleg_nenashev b/cert/ccd/default/oleg_nenashev
diff --git a/cert/ccd/default/olivergondza b/cert/ccd/default/olivergondza
diff --git a/cert/ccd/default/slide_o_mix b/cert/ccd/default/slide_o_mix
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.18 255.255.254.0
+ifconfig-push 10.8.0.18 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/smerle b/cert/ccd/default/smerle
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.19 255.255.254.0
+ifconfig-push 10.8.0.19 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/smerleCB b/cert/ccd/default/smerleCB
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.30 255.255.254.0
+ifconfig-push 10.8.0.30 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/timja b/cert/ccd/default/timja
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.20 255.255.254.0
+ifconfig-push 10.8.0.20 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/vlatombe b/cert/ccd/default/vlatombe
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.26 255.255.254.0
+ifconfig-push 10.8.0.26 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/vsilverman b/cert/ccd/default/vsilverman
diff --git a/cert/ccd/default/wfollonier b/cert/ccd/default/wfollonier
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.22 255.255.254.0
+ifconfig-push 10.8.0.22 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/cert/ccd/default/yafenkin b/cert/ccd/default/yafenkin
@@ -1,3 +1,3 @@
-ifconfig-push 10.8.0.27 255.255.254.0
+ifconfig-push 10.8.0.27 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.240.0.0 255.252.0.0"
diff --git a/config.yaml b/config.yaml
@@ -4,23 +4,11 @@
 #
 networks:
     - name: default
-      iprange: 10.8.0.1/24
-      netmask: 255.255.254.0
-      routes:
-          # prod-jenkins-public-prod/data-tier
-          - 10.0.2.0/24
-          # prod-jenkins-private-prod-vnet
-          - 10.240.0.0/14
-    - name: admin
-      iprange: 10.8.1.1/24
-      netmask: 255.255.254.0
+      iprange: 10.8.0.0/24
+      netmask: 255.255.255.0
       routes:
-          # prod-jenkins-public-prod/app-tier
-          - 10.0.1.0/24
           # prod-jenkins-public-prod/data-tier
           - 10.0.2.0/24
-          # prod-jenkins-public-prod/dmz-tier
-          - 10.0.99.0/24
           # prod-jenkins-private-prod-vnet
           - 10.240.0.0/14
     - name: private

diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -15,7 +15,7 @@ services:
         - "AUTH_LDAP_GROUPS_MEMBER=cn=all"
         - "OPENVPN_NETWORK_NAME=mocked-vnet"
         - "OPENVPN_SERVER_SUBNET=10.8.0.0"
-        - "OPENVPN_SERVER_NETMASK=255.255.254.0"
+        - "OPENVPN_SERVER_NETMASK=255.255.255.0"
     volumes:
         - ./mock/vpn/ccd:/home/openvpn/available-ccds:ro
         - ./mock/vpn/ca.crt:/etc/openvpn/server/ca.crt:ro

diff --git a/docker/mock/vpn/ccd/alice b/docker/mock/vpn/ccd/alice
@@ -1,2 +1,2 @@
 ifconfig-push 10.8.0.66 255.255.255.0
-push "route 10.0.1.0 255.255.255.0"
+push "route 10.0.2.0 255.255.255.0"
diff --git a/docker/mock/vpn/ccd/kohsuke b/docker/mock/vpn/ccd/kohsuke
@@ -1,4 +1,3 @@
-ifconfig-push 10.8.1.3 255.255.254.0
-push "route 10.0.1.0 255.255.255.0"
+ifconfig-push 10.8.1.3 255.255.255.0
 push "route 10.0.2.0 255.255.255.0"
 push "route 10.0.99.0 255.255.255.0"