diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml index 0a0aca5e4..331f52098 100644 --- a/example/controller-registration.yaml +++ b/example/controller-registration.yaml @@ -5,10 +5,10 @@ metadata: name: provider-metal type: helm providerConfig: - chart: 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 + chart: H4sIAAAAAAAAA+0ca2/bOLKf9SsI9xbYPZzlRxynMNDDZdNsN3dtYiS5Lg6HQ0FLtK1aFrWUlMTb7X+/4UuiZMmykjbZdjUIEImaGQ7JmeEMH15g5pKAsC65i0kQeTTohozeeC4UrUmM/d6zB0Mf4OjwUPwHKP4Xz4OD0WB4OByPeflgfNAfPUOHD6+6HpIoxgyhZ4zSeBde3fevFBa143+yxCy2N3jt37cOPsDj0ahy/IejYX78h/3h8OgZ6n/OhlbBn3z8cei9I4yP+wTdDCwchtlr3x68gD/LJZHDvDAWpcfoZ+KvkcO1As0pQ/GSoNdKi9BbrjJoqjQIpUplBXhNJqhW26ybrdqfuoe+bai3f5c69oI+pI46+z8cFv3/0cHRYWv/jwG93oJOFlwDcEyQbffg74YELmW9hRcvk5nt0HVPa0n2sMTOqqfpug4NYkZ9H5SGkYUXxVAKqmRHS5TXJmSrOt6dXl6dXZyrN3KH16FPelV8+OyDTuTHqY8DMpHczoI5w4CVOHHCdOEvlK0Iky+W1euhKciKF0T5LBLgmU8iZLY7SsKQKn+mCr1gIVybQxkjTowy0VBONCs0uX913qre/mMCQwOdFN07Emwc/w37B/1hG/89BjQZ//dL4ocwP9tx2CgWrPH/g+FwXBj/4XjY+v9HgY8fu8glcy8gqMNjtA7qfvpk1cdpnA6mCYFtmUx8PCN+ZEMgaa/IRrITL8mMsICAHtke7fGqcjwqWNxgP1EyffyIvMDxEzeV1EaKcIcg27RFATmXCarAUPWLmrZb4QWgPIFDBLl9SXyCI2Kfg3ClkqWieWuYMKRkCPEv3hwtcTRl8P0OdaIlHh6OJ1DtO149VMXx7RgvUEoRMi+I56jzXfSP76IiJiMhjbyYss0uFtBGUsZwcm+G0Fij3cUBcUno082aBLEK8lPliHqQepjd9dRW8eeBJv4fQqC5t1jjsCsG/wbCIsq6FEbzlnkxqVwjqIv/R+ODgv8/4kWt/38EUN4nZ9XvxMBe6HGVvi+3TLDyAnfCA3LQh7c4tLimuDjGE/AEMtMv99bliqOIIoikS1ypKJZORjrmSYk75+x/h0LQ5RiNOLYWR9QYvc9r6QT9zpnsbHWeneHUnnrIPivcy/4brgbW2P/44LBo/weDUb+1/8eAz2XYqW58UWOWtaQmjAC63a74bzZEKK6t9dhOVTuyFQOt9bbj08SF6AP74RIPBKO0C1S6Lzsjkem+VfCXip/jeyArYAbgRABNthDkLZRPRCkI6zgk5OUgWHy9CUkkuoqRXxOPERd1avjb2wyQF6X0nTr5yuiVyKKTdWlDqQzKZuKYhKkcv4ZNewUomtXLCdL6ZgmL4oY1CppmdUqS/JRSrlVr7Cwhcj4TM5iWM1corCem/+HLYzuJKyczzpLEjqs1M4I5ECj0K1dhHEXn2vQLlXBKW5HYKWbWpUCOweK9eFNPrRCN8cDOKgkzSSJnSdzErxZEEtgazxTDJX6MrwIcRksaTwnzqFvHpoQkM2uYNQg7Tlwv1vLJZcVSria6rfA0K8wLr+lV6CfBag9eOXyTWbkKVaLLipbEuaYrEtTXpDEzWq5Qd/WEAi1X489UmVldhRwxRzmlbD9KjphRxn50um+PZri5mk+Of/K45uXCxqraJXJmcy+2TQ4n8XKv0Y6X+wxyHkuy1dPfNXwJKroN6PJoJd4BpgqaBHw9/PSOL5ITto/gW0R7NGMnjawyIPEtZatrhudzz8l8QzNR8ly2a+HKDXgB9s8l5i5HW8+/yCzTjEHfmHb1RAFMs4YtwQaCCu9bUrPJxNa0ZsPCKhOq4RXmLIr79QpjqOHj4PLWA0fCJbsXT6DcxfVfZHN/xiuyKfIuGEhhynQTRqO9NFNPfYKi3j4q0dOxxSz2eIyhlahSZ/OsCnRGc4d7xSkifZ4mvn9FHEb4FOdQl7ivqLPS4fM/ry7OtagF9MyblFKVdVyDCr/VvP1zQZP8P1vAbbYAUJf/j8ajYv5/MG7z/0cBM23WK/EyA36VjvbeqwBfJPePQiImekZuPC7nzx73Xps33hqCb9QXX0Lfc3CUcxWq8IQ7eFlpBLLwJb6JyqNiZ/lmPznGkoG2BMXA6BQRJwUBjcUigeH991xeTWcriB5XUbI2ltqFEZavm+aG4XuxgYP+Yl8rKe0foeOnOF6izl4r950fRJPl5hPIYMpVmPEqRN25NHQPYWvE2lOJXqTztFIkIT0NYgzpMUvHqlun2Sow5P03QZ3i6rG5Rfbp02Trs9wo6+T58ClsSkFN8+mxpAjTj7lup+s1DtxMw7qoV+LDpdYsNyFhBmbes5undoAn1GnidtW4deeQy7zsQWbcK+8aNV49Y22uyIbXEvJjO1DPHS9wEsZgbLqM8BeoIHqZn+WVXOmzoLYzyqtN4ERmv/CavNxpoOZ15elra1sEFGqhIZFLg93MAVRWIEguNMVxSlDkfSuOMDVvgaSrk/yWzJaUrvQApy775Q6PXUkdEQZupMvDZ1MqhaUCaYk0LeQQnJvrRTyONXQx1zj1OVuN5cnTB+oFqPO3ThUvVXcZo1/UpwouJLgxLUt6hDenx69OL9+fvjk9uT67OH9/fvz29Gp6fHKaYiIkzgn8xOh6YhQiNPeI716Seb5UlXN3N0mnETsdhvtOHlres7fHr0/fgbAXl+8v3p1e/nJ5dr0l6wT1xIE1Y2esV7pVtmsO4IMebXeY1hA56kbNqdfdWsjZR13EkkZMHepP0PXJtJiMMBLRhDkkp+5pYVkylFH8joJdGZ7oNeona/KWhxMlTZbGYIi65ohyhOt950NHvGpXtUyYrVE38BjB7kXgw2wETpBUjzwfH88hxzJ9Pq+fN58jvhIS8HXgtISrj3sM2fdxySeULqi/SiBUWFzJNV14OhM+VBWf3hEnMTdWnqt+EXHAVS7g0x9Fh/DgD3J+0IDIDNgyjC5akU3lsaD04NAWHUJyQoBa0VlQ8llYX0mFvMo9DiHlyWIaUp8uNmKFo5M/nKRXf3TMIRV4K94paKCjt/5Ml7X3zp8Gl8xx4sdvISufoNGwrz41Uu/9lLu5vHXGskP2b3AhoUn+D/YK0yhLxE2QWeIuyH4LAbXn/0dHhfz/cHg0bPP/xwBlkosYfc8zsrLs+Qc0KB4BCkVe0rsZzEBF9ILBlLqvUvX4UajHH2PlAMLofwf4Bns+DwEF+yiZ1Tb4wSsGX4PLaGL/bIad+1wErLH/UX/r/M+wf9Te/3sU4MdnTMsWY8w3BinzfpM3XFYvRDyRnQ6S29mX1CdN7LuJ5bLE55FKl5/qec1oEoqwpYuMkzz5IzxWLtTnqGrTPZIvxipCSUkPdCBO5If8IkBpmYkuM+7cc/YZoouZEoc7QxGYepF8uOXeRDyF6VMSQl+S7WanTatttVzHcdPSvBCdv3a2mTuUMtcLzLHe5it8cYGbA+lCmbTNGOpy4eflt8IyFaDyF+GL+RGs0n69re3ETkf844vc4mGWUlTqvCRw157IEnLXvkyE0DP00vigtoEhT6nshnTSiwqvPciJsO/9pnULIlZIPMVjJDa9UjWWwbfCCtyQehox26/RhCJty72oLdDItBmwC7JVMAP7hJbI8gxj69MHOpMPEC1mDz3IUqSCJrG4W6cSfsc8XKfqhCrpWveTuDzgZV9Vn4oAxNtLv9VBKDvCoTCa0nHglPWsQEdo5GB/14gCjxgCCR9ardHlGBaYP5enFLs8SPHmnoOqfJ5Ci7GzKq1wDlnyLfb93IjdetxNNO0qvS1cV6XYNt6Dn7uHnwYcUFDmKX3KXpu40YfNYj9K/f1ikxlUodYAdf/skNBKT6Aa02yNPBDNfgDnKLRHEl/lVmg+T/D91KFKC18AmsT/asponALU5v/94u9/DMfD9v7Po0Dp+X/lPf4Y2XsszqErb3g2zaXl++3bp9sUXXX8bTQ6EBl9fj9BLKhiBlNMo+2Jpx7Bh8E97F+FjPu7gTr7H44GBfsfDfvt+Z9HgV32r6OHJ3UDT91B3zjU27/csHrID4DV2P/BcFg8/9cfHbX2/yggzzOJtEyfX5qgxdJhPFky8sCyQ0aFn4Tgs+digsRcwVOO0DjddOzf4k1kWeYy+wQNrCwZRB8/WZZxCkRd90sX6eQafOFkywQdWqiwPLcDUS7Q7eJUdUBngubYj4hlbR9ImaD//s8qHC8RZZDil+1w8qPofP/WUze4nht7nSFOInkWRhyTsOQ+r+yiS3OAsp9myjZ9zceZT2e9NeYhU2+WeL7bE6x78og0P9Jl6W12g6sc9QWlC5+8z47ISdouXrvjkSITI905sPsdVZD+btvAHgzsu6+7VYOtVnX+/pK3bCg/2LZtWbmYcGLJUxH6aAuPMC0n/VR+D7TsFigOhYFwpN6HiAZaV7MbmaUY4q7koC83q9VFxsEBf83fF+R6aV74K9xdyC776QJ9fU8yzt3IS+/jWXrjfPuOnVV9fyi9GCEtS+zbl97uKUEsuaAjW1Z+jSa9RKPeRRaQtjB9IkapvPkhx6542W9LoJJLfCVCp5ftLNkAfn1OfxB34vTLNBXPuLmmP6qbaJZ5h6yksuLtr9RXx6LAKgx97tJKaYcXL5dwf11xl6PqJoeV/q6QNBfdKi2burjdhnwttNBCCy200EILLbTQQgsttNBCCy200EILLbTQQgsttNBCCy200EILDeD/tumBLgB4AAA= values: image: - tag: v0.18.15 + tag: v0.18.18 --- apiVersion: core.gardener.cloud/v1beta1 kind: ControllerRegistration diff --git a/pkg/controller/controlplane/valuesprovider.go b/pkg/controller/controlplane/valuesprovider.go index 244ab01f7..eae3df56b 100644 --- a/pkg/controller/controlplane/valuesprovider.go +++ b/pkg/controller/controlplane/valuesprovider.go @@ -793,22 +793,24 @@ func (vp *valuesProvider) getFirewallSpec(ctx context.Context, metalControlPlane } n := n - // prefixes in the firewall machine allocation are just a snapshot when the firewall was created. - // -> when changing prefixes in the referenced network the firewall does not know about any prefix changes. + // prefixes and destination prefixes in the firewall machine allocation are just a snapshot when the firewall was created. + // -> when changing prefixes or destination prefixes in the referenced network the firewall does not know about any changes. // - // we replace the prefixes from the snapshot with the actual prefixes that are currently attached to the network. - // this allows dynamic prefix reconfiguration of the firewall. + // we replace the prefixes and destination prefixes from the snapshot with the actual prefixes that are currently attached to the network. + // this allows dynamic prefix and destination prefix reconfiguration of the firewall. prefixes := n.Prefixes + destinationprefixes := n.Destinationprefixes networkRef, ok := nws[*n.Networkid] if !ok { vp.logger.Info("network in firewall allocation does not exist anymore") } else { prefixes = networkRef.Prefixes + destinationprefixes = networkRef.Destinationprefixes } firewallNetworks = append(firewallNetworks, firewallv1.FirewallNetwork{ Asn: n.Asn, - Destinationprefixes: n.Destinationprefixes, + Destinationprefixes: destinationprefixes, Ips: n.Ips, Nat: n.Nat, Networkid: n.Networkid, diff --git a/pkg/controller/infrastructure/actuator_reconcile.go b/pkg/controller/infrastructure/actuator_reconcile.go index f76fb28b4..87d7ef153 100644 --- a/pkg/controller/infrastructure/actuator_reconcile.go +++ b/pkg/controller/infrastructure/actuator_reconcile.go @@ -303,6 +303,7 @@ func firewallNextAction(ctx context.Context, r *firewallReconciler) (firewallRec err := fmt.Errorf("multiple firewalls exist for this cluster, which is currently unsupported. delete these firewalls and try to keep the one with machine id %q", r.machineIDInStatus) r.logger.Error( err, + "multiple firewalls detected", "clusterID", r.clusterID, "expectedMachineID", r.machineIDInStatus, )