diff --git a/pkg/cluster/zz_generated.templates.go b/pkg/cluster/zz_generated.templates.go index a397dec..ef36933 100644 --- a/pkg/cluster/zz_generated.templates.go +++ b/pkg/cluster/zz_generated.templates.go @@ -40,9 +40,9 @@ var Files = func() http.FileSystem { "/kube-proxy.yaml": &vfsgen۰CompressedFileInfo{ name: "kube-proxy.yaml", modTime: time.Time{}, - uncompressedSize: 1741, + uncompressedSize: 1874, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x54\x41\x6f\xeb\x36\x0c\xbe\xfb\x57\xf0\xb0\xc3\x76\x90\x8d\xdd\x0a\x03\xef\x10\xe4\xb5\xc0\xb0\x35\x0d\x5a\x6c\xc0\x4e\x03\x2d\xd3\xa9\x10\x59\x34\x24\xda\x8b\x91\xf5\xbf\x0f\x8a\x5d\xc7\x6e\x92\xf6\xe9\x62\x83\xa4\x3e\x92\xdf\x47\x51\x29\x95\x60\x63\xfe\x22\x1f\x0c\xbb\x1c\xb0\x69\x42\xd6\xfd\x9a\xec\x8d\x2b\x73\xf8\x8e\x54\xb3\x7b\x21\x49\x6a\x12\x2c\x51\x30\x4f\x00\x2c\x16\x64\x43\xfc\x03\xd8\xdf\x05\x85\x4d\x93\xc3\xbe\x2d\x48\x35\x9e\x0f\x7d\x02\xe0\xb0\xa6\x2b\xa6\xd0\xa0\x7e\xb7\x87\x3e\x08\xd5\x49\x68\x48\x47\xa4\x40\x96\xb4\xb0\x1f\x50\x6b\x14\xfd\xfa\xc7\x2c\xcd\xad\x44\x6d\x53\xa2\xd0\x8b\x78\x14\xda\xf5\x43\xac\xf4\x0d\xe5\xf0\xcc\xd6\x1a\xb7\xfb\xf3\x14\x90\x00\x08\xd5\x8d\x45\xa1\x31\xc1\xac\x9d\x78\xec\x22\xd7\xad\x6c\x00\xef\xe5\xc6\xd3\x78\xc3\xde\x48\xbf\xb6\x18\xc2\xe6\xd4\xf1\xd0\x94\x72\x5c\x92\xd2\xde\x88\xd1\x68\xc7\x68\xcd\x4e\xd0\x38\xf2\x53\x16\x75\x8d\xa6\xe1\x98\x1a\x77\xd1\x73\x17\xd2\x9d\xf6\xa9\xe1\xec\x1c\x94\x77\xc7\x23\xa4\x1b\x2e\x69\xcd\xae\x32\xbb\xd6\xa3\x18\x76\xe9\xef\x6d\x41\xde\x91\x50\x18\xc5\x84\xb7\xb7\x25\xe0\xb6\xb5\x76\xcb\xd6\xe8\x3e\x87\xdf\xaa\x0d\xcb\xd6\x53\x20\x27\x53\x94\xe6\xba\x46\x57\x9e\x69\x50\x90\xb5\xc1\x67\x96\x35\xda\xac\x30\x2e\xbb\x52\xab\x02\xa5\xf4\xa9\x92\x6f\x59\x87\x3e\xb3\xa6\x98\x85\x65\x83\x2b\x8d\x9f\xc5\x95\x57\x0e\x12\xfb\x57\xdc\x91\xf7\xa6\xa4\x6f\x3f\xfd\xbc\x79\xfa\x7e\xff\xcf\x66\xf5\x78\xff\xcb\x14\x1a\x48\xb7\x27\x92\xd9\x09\x1d\xe4\x5c\xda\x89\xff\xce\x58\xda\x51\x99\x83\xf8\x96\x26\x57\xc7\xb6\xad\xe9\x91\x5b\x27\x61\xde\x4b\x1d\x2d\x5b\x94\xd7\x1c\xae\x54\x3a\x43\xbe\xa9\xcb\x12\xc3\xb7\x2e\x3b\x08\x16\x96\x42\x6a\x59\xef\x2f\x10\x46\xa7\xfa\xe0\xf4\x84\xe5\x93\xb3\x7d\x0e\x15\xda\x40\x37\xd0\x63\x75\x35\x97\xad\xa5\x70\x01\x6c\x4d\xa1\x2e\x7d\x67\xdc\x05\x1d\xe4\xba\x39\x6d\xef\x63\x37\x91\x3d\xf3\x01\x74\x68\x5b\x7a\xf0\x5c\xe7\x0b\x33\x40\x65\xc8\x96\xcf\x54\x7d\xb4\x8f\x9e\xa1\xe8\xf8\x3c\xd2\x38\xfd\xf1\x39\x8c\x81\x51\xe8\x0d\xc9\xbf\xec\xf7\x8b\xc2\x02\xf9\xce\x68\x5a\x69\x1d\x9b\xde\x5c\xa7\x7c\x90\xf2\x47\x9e\xcc\x30\x67\x8f\xd8\xe4\x5f\x0b\xa9\x3e\xd3\x27\xd6\x7b\xea\x66\x3e\x6a\x5f\x0a\x3e\x2c\x9d\x07\x63\xe9\xc9\xaf\x3d\x0d\x3b\x67\x9e\xeb\x9a\x64\x9f\xa4\xba\x54\x5f\xd8\xd2\xf0\xd4\x67\x74\xec\xa9\xcf\x61\x3d\x6e\x9a\x55\x59\xb2\x0b\x71\x02\x26\x3c\x6e\xe2\x1d\xf6\x39\xdc\x1f\x4c\x90\x30\x5d\xbc\xe1\x88\xda\xbd\x2c\x56\x71\x3c\x05\x09\xa6\xfb\x69\xbf\xc4\x7d\xc4\x21\xb6\xe4\xda\xc3\x18\x74\x3c\x2a\x30\x15\x9c\xb6\xd0\x36\x52\xbd\x5c\x4e\xab\xaa\x32\xce\x48\x7f\xde\x49\x38\x5a\xf2\xe4\x78\x04\xe1\xbf\xb1\xb6\x5f\xdf\xfe\x0f\x8c\x2b\xc9\x09\xdc\x9d\x81\x62\x66\x72\x65\x34\xfc\x1f\x00\x00\xff\xff\x3e\xb5\x40\x06\xcd\x06\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x55\xcd\x8e\xe3\x36\x0c\xbe\xfb\x29\x78\xe8\xa1\x3d\xc8\x46\x6f\x03\x03\x7b\x08\xb2\x59\xa0\x68\x27\x13\xec\xa0\x05\x7a\x2a\x68\x99\xce\x08\x91\x45\x43\xa2\xdd\x18\xe9\xbe\x7b\xa1\xd8\x71\xec\x4d\xb2\x33\xbc\x24\xe0\x3f\xf9\x51\x9f\x95\x52\x09\x36\xe6\x2f\xf2\xc1\xb0\xcb\x01\x9b\x26\x64\xdd\xaf\xc9\xc1\xb8\x32\x87\xcf\x48\x35\xbb\x57\x92\xa4\x26\xc1\x12\x05\xf3\x04\xc0\x62\x41\x36\xc4\x7f\x00\x87\xa7\xa0\xb0\x69\x72\x38\xb4\x05\xa9\xc6\xf3\xb1\x4f\x00\x1c\xd6\x74\x47\x15\x1a\xd4\x17\x7d\xe8\x83\x50\x9d\x84\x86\x74\xcc\x14\xc8\x92\x16\xf6\x43\xd6\x1a\x45\xbf\xfd\x31\x2b\xf3\xa8\x50\xdb\x94\x28\xf4\x2a\x1e\x85\xf6\xfd\xe0\x2b\x7d\x43\x39\x7c\x65\x6b\x8d\xdb\xff\x79\x76\x48\x00\x84\xea\xc6\xa2\xd0\x58\x60\x36\x4e\x14\xbb\xa8\xf5\xa8\xda\x20\xa7\x93\x02\x53\x41\xfa\x7b\x5b\xd0\x2e\x5a\xd6\xec\x2a\xb3\x6f\x3d\x8a\x61\x97\x6e\x8e\xe2\x71\xe8\x1d\xbe\x7d\x4b\x4e\x27\x10\xfe\x1b\x6b\xfb\xa1\x80\xff\xc0\xb8\x92\x9c\xc0\x53\x8c\x9d\x57\x24\x57\x5e\x54\x97\x9d\x45\x69\xbc\x61\x6f\xa4\x5f\x5b\x0c\x61\x7b\x5e\xfb\xb0\x59\xe5\xb8\x24\xa5\xbd\x11\xa3\xd1\x8e\xde\x9a\x9d\xa0\x71\xe4\xa7\x51\xd5\x3d\xac\x06\x31\x35\xee\xa3\xe5\x29\xa4\x7b\xed\x53\xc3\xd9\xd5\x29\xef\x4e\x27\x48\xb7\x5c\xd2\x72\x96\x38\xa2\x77\x24\x14\xc6\x8b\x9a\x8f\x71\x4e\xb8\x6b\xad\xdd\xb1\x35\xba\xcf\xe1\xb7\x6a\xcb\xb2\xf3\x14\xc8\xc9\xe4\xa5\xb9\xae\xd1\x95\x57\x2c\x14\x64\x6d\xf0\x99\x65\x8d\x36\x2b\x8c\xcb\xee\xf4\xaa\x40\x29\x7d\xee\xe4\x53\xd6\xa1\xcf\xac\x29\x66\x6e\xd9\x60\x4a\xe3\xcf\x22\xe4\x8d\x83\xc4\xf9\x15\x77\xe4\xbd\x29\xe9\xd3\x4f\x3f\x6f\x5f\x3e\x6f\xfe\xd9\xae\x9e\x37\xbf\x4c\xae\x81\x74\x7b\x5e\x32\x3b\xa1\xa3\x5c\x5b\x3b\xef\xbf\x33\x96\xf6\x54\xe6\x20\xbe\xa5\xc9\xd4\xb1\x6d\x6b\x7a\xe6\xd6\x49\x98\xcf\x52\x47\xcd\x0e\xe5\x2d\x87\x3b\x9d\xce\x32\x3f\xc4\x65\x99\xc3\xb7\x2e\x3b\x0a\x16\x96\x42\x6a\x59\x1f\x6e\x32\x8c\x46\xf5\x9d\xd1\x13\x96\x2f\xce\xf6\x39\x54\x68\x03\x3d\xc8\x1e\xbb\xab\xb9\x6c\x2d\x85\x9b\xc4\xd6\x14\xea\xd6\x76\xcd\xbb\x58\x07\xb9\x6e\xbe\xb6\xcb\xd9\x4d\xcb\x9e\xd9\x00\x3a\xb4\x2d\x7d\xf1\x5c\xe7\x0b\x35\x40\x65\xc8\x96\x5f\xa9\xfa\x5e\x3f\x5a\x86\xa6\xe3\xf3\x48\xe3\xf5\xc7\xe7\x30\x3a\x46\xa0\xb7\x24\xff\xb2\x3f\x2c\x1a\x0b\xe4\x3b\xa3\x69\xa5\x75\x1c\x7a\x7b\x7f\xe5\x03\x94\x1f\x79\x32\xc3\x9d\x3d\x63\x93\xbf\x0f\xa4\xfa\x11\x3e\xb1\xdf\xf3\x34\xf3\x53\x7b\x17\xf0\x81\xf9\xbe\x18\x4b\x2f\x7e\xed\x69\x20\xbe\x79\xad\x7b\x90\xfd\xa0\xd4\x2d\xfa\xc2\x96\x86\xa7\x3e\x5b\xc7\x81\xfa\x1c\xd6\x23\xd3\xac\xca\x92\x5d\x88\x17\x30\xe5\xe3\x26\xc6\xb0\xcf\x61\x73\x34\x41\xc2\x14\xf8\xc0\x10\xb1\x7b\x5d\x7c\x0f\xa2\x14\x24\x98\x1e\x26\x7e\x89\x7c\xc4\x21\x8e\xe4\xda\xe3\xe8\xf4\x0e\x33\xaf\xaa\xca\x38\x23\xfd\x95\x93\x70\xd4\xe4\x1f\xa0\xe9\x29\xfa\x1e\x47\xcf\x18\xfa\xff\x00\x00\x00\xff\xff\x29\x83\x3f\xf0\x52\x07\x00\x00"), }, "/psp-privileged.yaml": &vfsgen۰CompressedFileInfo{ name: "psp-privileged.yaml", diff --git a/pkg/config/v1alpha2/types.go b/pkg/config/v1alpha2/types.go index 97d09e2..11a8b82 100644 --- a/pkg/config/v1alpha2/types.go +++ b/pkg/config/v1alpha2/types.go @@ -219,7 +219,8 @@ type KubeProxyConfiguration struct { // in the future. // // https://github.com/kubernetes-sigs/controller-tools/issues/245 - Config *kubeproxyconfigv1alpha1.KubeProxyConfiguration `json:"config,omitempty"` - Disabled bool `json:"disabled"` - Affinity *corev1.Affinity `json:"affinity,omitempty"` + Config *kubeproxyconfigv1alpha1.KubeProxyConfiguration `json:"config,omitempty"` + Disabled bool `json:"disabled"` + Affinity *corev1.Affinity `json:"affinity,omitempty"` + ExtraLabels map[string]string `json:"extraLabels,omitempty"` } diff --git a/pkg/config/v1alpha2/zz_generated.deepcopy.go b/pkg/config/v1alpha2/zz_generated.deepcopy.go index 4d219b3..42dc67f 100644 --- a/pkg/config/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/config/v1alpha2/zz_generated.deepcopy.go @@ -214,6 +214,13 @@ func (in *KubeProxyConfiguration) DeepCopyInto(out *KubeProxyConfiguration) { *out = new(v1.Affinity) (*in).DeepCopyInto(*out) } + if in.ExtraLabels != nil { + in, out := &in.ExtraLabels, &out.ExtraLabels + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } return } diff --git a/templates/kube-proxy.yaml b/templates/kube-proxy.yaml index 9d59356..9cbcf0a 100644 --- a/templates/kube-proxy.yaml +++ b/templates/kube-proxy.yaml @@ -16,6 +16,9 @@ spec: metadata: labels: k8s-app: kube-proxy + {{- if .KubeProxyConfiguration.ExtraLabels }} +{{ toYaml .KubeProxyConfiguration.ExtraLabels | indent 8 }} + {{- end }} spec: priorityClassName: system-node-critical containers: