Allow dynamic reconfiguration of prefixes on the firewall (#169)

* Remove unnecessary duplicated backend calls. * Replace prefixes of machine allocation with prefixes from actual network. * Update firewall-controller to 1.0.2. * Generate.
metal-stack · Apr 8, 2021 · 3141b7d · 3141b7d
1 parent dc8ee4e
commit 3141b7d
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 51 deletions.
diff --git a/charts/images.yaml b/charts/images.yaml
@@ -46,7 +46,7 @@ images:
 # firewall-controller tag must be semver compatible with golang dependency!
 - name: firewall-controller
   sourceRepository: https://github.com/metal-stack/firewall-controller
-  tag: "v1.0.1"
+  tag: "v1.0.2"
 
 # can be provided via image override:
 # - name: authn-webhook

diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml
@@ -14,7 +14,7 @@ spec:
   deployment:
     type: helm
     providerConfig:
-      chart: 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
+      chart: H4sIAAAAAAAAA+0ca2/bOLKf9SsI9xbYPZzlt7sQ0MNl29xu7trESHItDodDQUu0rVoWtaSUx3X732/4kETJkmUnadLualCgMh/DITkznBkOEzF65XuEdTckxkHv2ZeAPsCLyUT+D1D+X34PRuPBcDKcTkU5fPUnz9Dki1BTgoTHmCH0jFEa72rXVP+NQlTc/1crzGL7Fm+CBxyjaf+Hg0lp/8fj0egZ6j8gDbXwB99/HPnvCOM+DR10NbBwFOU/+/Zgavctj3CX+VEsC4/QLyTYIFfwCVpQhuIVQT9j5pGQMPRWMBGaaZ5C5CYmoUBmhXhDHFRkNuuqPNJTL8YfEEry71HXXtIHHqNJ/ifDsv4fTfuDVv4fA3q9JXWWQnhxTJBt9+DfFQk9ynpLP14lc9ulm95SC3j+scLuupf267o0jBkNAuAjRpY+j6EUJNvmq5LMI1uP8e74/OLk7FT/Ijd4EwWkV4dHHEjolaqcBTgkjsJ2Ei4YhlaJGycsLXxP2Zow9cOyej00A1rxkmilRUI8DwhH5rx5EkVUKzRd6IdLqdtcyhhxY5SThgqkWZGJ/ZtTYSX5jwnsA6wIf0hL8HD7bzzpj1r77zGgdv8/rEgQwQFtx9F9bcGG/R8Mh2X770V/1G/1/2PAp09d5JGFHxLUEUZaB3U/f7ZSNd/NLLhuyXYT/eCYkK0tE0mA5yTgNhiS9prcKnTyRzInLCTAWrZPe2KoAo4aFFc4SDRNnz4hP3SDxMsotZHuuIOQ7b5lAgUWB9W00OPLkbZn4YfAPKFLZHf7nAQEc2KfAnGVlGWk+Rs4MBRlCIkaf4FWmM8Y1N+gDl/h4WTqwLDvxPAwlGhvx3iJsh4R88N4gTrf8b99x8stGYko92PKbnehgDmSKoTOnRHCZI15lzfEI1FAbzckjLXhnzEH74HrYSzXUwvFHwhq9T/YOwt/ucFRV+70FdhAlHUpbN0182NySIyg6fwfT0dF/T8cTacvWv3/GKC1T0Gq38m9Pku3Wum+Qphg7YeeIwxyYJG3OLIE83g4xg5oAuXqV2vral7SnThY0hWqVBYrJaMUs1OhzgX636AQTq0YjUXrlBw5Iv9QZFwH/SaQ7Jx1EZ2h1J56yx4UmuX//tHABvmfjCbDsv03Gg9b+X8MeCjBztjliwqzGiUTYQTQ7Xbl/+ZEJC/bKWvbmRHLbY0gtW9tN6CJB9YHDqIVHkhE2RJod18tRqLcfaukLzU+N/CBVmgZghKBZmqGQG+p3JGlQKzrkkiUA2Hx5W1EuFwqRn5NfEY81GnAb28jQD7P+nea6Kvqr0mWi5yWHkiV0fMwcsyOGR2/RoeuCvQ4bFzRIRtvnjAeHzii7HPYmKpL8Uip5qoNdldgOZ/IEyyls1AopSem/xbhsZ2daw8zgZLErpdyJoczEHqkPwULY85PU9EvDSJ62rqLnbXMlxS6Y5B4P75t7q0bGvuB3XUS5ZRwd0W8JKgnRHWw03YmGR4JYnwR4oivaDwjzKdeE5qKLrlYw6lB2FHi+XFKnworVmI1m9u6XYoKJ/FqDxSimdm1mmHKrRTaVA9eQk0Y12IvNqtgE9AZNAlFYPT4RkRLCduH8K1Oe0xjZx81JPjg15StLxleLHw3Z5LDSCli2R4FzEdQTCzEwalquUvimvGXkeViOegb+jfVGIA0n9iK8jisEcOKkU0kdtrXnJhodxdcMk5eEPCSMb0nHhdXzx4wEkHZnXBCz11Y/0lu7454TW7LuEsCUtKdXsIo34szUx0oezTLR23zTFMS4qX8U8uuRSx5F2OSw72OKek9zZIguCAuI0LDudQj3mvqrlPr6R8XZ6cpgaXmuQ6p7FW1XAcM+Ht12x4Mav2/PFp3bwewwf+bjqfjsv83gaLW/3sEMN2mNBKrPKDXGQPs7QV+Ed+PR0Se74xc+YLOX3yhuW7f+BswvlBf1kSB72Je0BW68JXQ62pQDrSIEI+j7ejYXb3Zj46pQpAKh0ZgLIo0j8KQxtJJNJT+nuG17JBaEXfNk40RfZVyWR03K2zD9zKAj/5kX2oq7Z9g4Wc4XqHOXsHczg9yyuryAWgw6SoddDWk7gwN3IHYBrL2ZKIfs+NZM5KkHhxODO4Ry/aq28TZ2h4U6+egTjl6aF6RfP7sbFWri5JOEY84w2YU2LToHqkeUVZZWHa62eDQyzmsi3oVt3WKa1bgTzOjZVHZm1kbgBPGNNt29b51F35AXvbAM+pVL43er54RmymjEaNEIm0DxrkRBW7CGOxNlxHxAwbgL4vHvKYr+5a97bznxW3ocnNdxEh+IRvk8LGK/RtHW4YURqERUaGhbq4AageQXc7SHkdZhzLua5nCcvgMVL8myq/JfEXpOt3gTGW/3KGxa3tzwkCNdIXVbFKlW2n7WTWalVwHgc3zuTBfDV4sTE5X59E44TN9pH6IOn/p1OHSY1cheq+rarCQ8MqULKUR3hwfvT4+/3D85vjV5cnZ6YfTo7fHF7OjV8dZS4TkPfHfGd04RiFCC58E3jlZFEt1uVB3TnaM2Nk23PXwSOk9eXv08/E7IPbs/MPZu+Pz9+cnl1u0OqgnE5aMm5Fe5VXJrjNAbDrfXrCUQ9SuGyNnWndWdj73YRcZyYipSwMHXb6alb0RRjhNmEsK7J4VVjlCeY/fULjLsZOrRoNkQ94Kc6JiykoYDFI3oqHa4Wbded8dr7tVqyJma9eNdoxg7ywM4DQCJUjqd17sj++SI+U1nzafm8+RCICEIg6YlQj28Y7A6T6qqEJZQPV1AqbC8kLF9ODrROpQXXx8Q9zEDKw/1+si7YCLgsGXVsoFEcYfuPrAAdw02PIWXbQmt7VpIVniyFY/hNSBAKOik7CiWkpfxYBiyD2SUIrdYhrRgC5vZWCjU0xOSYM+qc2hGHjL3ilxoJte/Zgqa++bnxQ8ssBJEL8Ft9xB42FfVx3E3vsx9+H0NgnLDtp/h5GEWv8fhBPOTJbIvP954i3JnQMBjfnf4xel/I/B+MW09f8fA7RILmP0vfDIqrznH9CgnAISSb+kdzWYA9ekAYMZ9V5nHPOT5JivI3IAZvS/QnyF/UCYgBI9T+aNE753xOBbUBm18s/m2H2gh2AN8j8aT0r5X4PpqN/K/6OASJ8wJVtuu7gPpMz/n3rhsP5R2hN5doi6zjynATlEvg+RXJYEwlLpiqyOnxlNImm2dJGRyVFM4bAKpr5oqi9dufxR9Owry3rAB3GiqsygQ0WJ2VR53IXvvBqsi7kmRyhDaZj6XH1cC20iv6LsK4lgLcn2tLOpNc5axXG8rLRIROfPnW3knU7F4qU2HTfqpCZW9aVAEmhq8UNqS5EkUznz6/I087lX09SVAWn5Mc/61vKn6uBtfGnRF57omA0i3+Aho0Lf1IJPkZeWFiU7oBRNYEOCKyg/ubyH4ttLJ/V/RP20YX6pknaUjlThh76L5CYXA+uRrYI5SAzQq8rzFltVH+lcfYBJl3/0wG9QLJPE8rWTdsFdM91JjwlD0k26GjKd289r9cpJk8Dfi+N0aorNcSTZuHK1Rc9mVMAJlLs42LVvgCOGoz2AWafNlcQ20imZG6TZXVciXoB/eo2DoLAz174Q0EOXJL2MbRpSXtZW4LuXFv9JccsXU+YwhI6BpbPeQaGVZeAZx0wDPWDNfQTVI08M1fmiEKF4GOPzqY/qLwK19p/WRg9hAjb6f/2t/N/+sM3/fxSozP/V0vN1eG+xzEPV2uBkVnDL9ru3zcLUXZ31NB6PpEdXjCfLgBpmYK8cFJ5+6h28HzTJv7ZG7qUGmuR/OB6U4j/9cb/N/3gU2CX/6en5pGrgqRfodw4l+Ve3Ew/8B4Ca4j/90aD8/n/6on3//Sig8lmko5HmrzhouXKZcBYMb6QqyaT0JFycnksHyeNDmNyRkd1yFFzjW25ZZpjVQQMrd2/Qp8+WZWQB6Oc+WdRFxWBLmQ0OmlioFMnZ0VAFaHZhqkvQcNACB5xY1nZCgoP+81+rlF4gy6znqOqGS2Qgi/s7X7/geG7cdUU44SoXQl6TW+qeTy3RublB+Z9myS/9zM95QOe9DRYmU2+e+IHXk6h7KkdWpPRY6TWrgVXt+pLSZUA+5ClSqm8Xb7zpWHeTO90Z2f2OLsj+ltPAHgzsm297VoOtWXX++lLMbKgqbNu2rIJN6FjqVjxNbRAWpuVmVdXvwKpegeFICoho1PvIaZjyav4iq7KFfCs16KvLSv2QaTDqW+X3QoIvzQc/pZT1/LFPWpA+31GICy9ysvc4Vnpxuv3Gxqp/NpLlwyvJkve2lY86KhpWvMtQM6t+PZG9ndC/pReQzTD7IkapSvhXe1d+7LNFUP6Ip4LW8vObTGvGssAqbULh1UDl1I3sfqE0azLq6/LpreyPeyieJZoTUrL068nW7mqhhRZaaKGFFlpooYUWWmihhRZaaKGFFlpooYUWWmihhRZaaKGFFlpooYUWWvi64f/5YrCUAHgAAA==
       values:
         image:
-          tag: v0.15.5
+          tag: v0.16.0
diff --git a/go.mod b/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/google/uuid v1.2.0
 	github.com/imdario/mergo v0.3.11
 	github.com/metal-stack/duros-controller v0.1.1
-	github.com/metal-stack/firewall-controller v1.0.1
+	github.com/metal-stack/firewall-controller v1.0.2
 	github.com/metal-stack/machine-controller-manager-provider-metal v0.1.3
 	github.com/metal-stack/metal-go v0.14.0
 	github.com/metal-stack/metal-lib v0.7.2