Skip to content

Commit

Permalink
Update templates to use CloudProviderName and KubeletCloudProviderName
Browse files Browse the repository at this point in the history 
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
  • Loading branch information
@xmudrii
xmudrii committed Jan 13, 2022
1 parent 7e9a3df commit 1a94433
Show file tree
Hide file tree
Showing 12 changed files with 76 additions and 73 deletions.
2 changes: 1 addition & 1 deletion pkg/userdata/amzn2/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ write_files:
- path: "/etc/systemd/system/kubelet.service"
content: |
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .KubeletCloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
- path: "/etc/kubernetes/cloud-config"
permissions: "0600"
Expand Down
21 changes: 11 additions & 10 deletions pkg/userdata/amzn2/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,16 +241,17 @@ func TestUserDataGeneration(t *testing.T) {
}

req := plugin.UserDataRequest{
MachineSpec: test.spec,
Kubeconfig: kubeconfig,
CloudConfig: cloudConfig,
CloudProviderName: cloudProviderName,
DNSIPs: test.clusterDNSIPs,
ExternalCloudProvider: test.externalCloudProvider,
HTTPProxy: test.httpProxy,
NoProxy: test.noProxy,
PauseImage: test.pauseImage,
KubeletFeatureGates: kubeletFeatureGates,
MachineSpec: test.spec,
Kubeconfig: kubeconfig,
CloudConfig: cloudConfig,
CloudProviderName: cloudProvider.name,
KubeletCloudProviderName: cloudProviderName,
DNSIPs: test.clusterDNSIPs,
ExternalCloudProvider: test.externalCloudProvider,
HTTPProxy: test.httpProxy,
NoProxy: test.noProxy,
PauseImage: test.pauseImage,
KubeletFeatureGates: kubeletFeatureGates,
ContainerRuntime: containerruntime.Get(
test.containerruntime,
containerruntime.WithInsecureRegistries(test.insecureRegistries),
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/centos/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ write_files:
- path: "/etc/systemd/system/kubelet.service"
content: |
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .KubeletCloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
- path: "/etc/kubernetes/cloud-config"
permissions: "0600"
Expand Down
21 changes: 11 additions & 10 deletions pkg/userdata/centos/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,16 +241,17 @@ func TestUserDataGeneration(t *testing.T) {
}

req := plugin.UserDataRequest{
MachineSpec: test.spec,
Kubeconfig: kubeconfig,
CloudConfig: cloudConfig,
CloudProviderName: cloudProviderName,
DNSIPs: test.clusterDNSIPs,
ExternalCloudProvider: test.externalCloudProvider,
HTTPProxy: test.httpProxy,
NoProxy: test.noProxy,
PauseImage: test.pauseImage,
KubeletFeatureGates: kubeletFeatureGates,
MachineSpec: test.spec,
Kubeconfig: kubeconfig,
CloudConfig: cloudConfig,
CloudProviderName: cloudProvider.name,
KubeletCloudProviderName: cloudProviderName,
DNSIPs: test.clusterDNSIPs,
ExternalCloudProvider: test.externalCloudProvider,
HTTPProxy: test.httpProxy,
NoProxy: test.noProxy,
PauseImage: test.pauseImage,
KubeletFeatureGates: kubeletFeatureGates,
ContainerRuntime: containerruntime.Get(
test.containerruntime,
containerruntime.WithInsecureRegistries(test.insecureRegistries),
Expand Down
4 changes: 2 additions & 2 deletions pkg/userdata/flatcar/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ systemd:
Requires=download-script.service
After=download-script.service
contents: |
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 8 }}
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .KubeletCloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 8 }}
storage:
files:
Expand Down Expand Up @@ -520,7 +520,7 @@ coreos:
Requires=download-script.service
After=download-script.service
content: |
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 6 }}
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .KubeletCloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 6 }}
- name: apply-sysctl-settings.service
enable: true
Expand Down
24 changes: 12 additions & 12 deletions pkg/userdata/flatcar/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"github.com/kubermatic/machine-controller/pkg/containerruntime"
providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
testhelper "github.com/kubermatic/machine-controller/pkg/test"
"github.com/kubermatic/machine-controller/pkg/userdata/cloud"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -102,7 +101,7 @@ func (p *fakeCloudConfigProvider) GetCloudConfig(spec clusterv1alpha1.MachineSpe
type userDataTestCase struct {
name string
spec clusterv1alpha1.MachineSpec
ccProvider cloud.ConfigProvider
ccProvider *fakeCloudConfigProvider
osConfig *Config
providerSpec *providerconfigtypes.Config
DNSIPs []net.IP
Expand Down Expand Up @@ -421,16 +420,17 @@ func TestUserDataGeneration(t *testing.T) {
}

req := plugin.UserDataRequest{
MachineSpec: test.spec,
Kubeconfig: kubeconfig,
CloudConfig: cloudConfig,
CloudProviderName: cloudProviderName,
DNSIPs: test.DNSIPs,
ExternalCloudProvider: test.externalCloudProvider,
HTTPProxy: test.httpProxy,
NoProxy: test.noProxy,
PauseImage: test.pauseImage,
KubeletFeatureGates: kubeletFeatureGates,
MachineSpec: test.spec,
Kubeconfig: kubeconfig,
CloudConfig: cloudConfig,
CloudProviderName: test.ccProvider.name,
KubeletCloudProviderName: cloudProviderName,
DNSIPs: test.DNSIPs,
ExternalCloudProvider: test.externalCloudProvider,
HTTPProxy: test.httpProxy,
NoProxy: test.noProxy,
PauseImage: test.pauseImage,
KubeletFeatureGates: kubeletFeatureGates,
ContainerRuntime: containerruntime.Get(
test.containerruntime,
containerruntime.WithInsecureRegistries(test.insecureRegistries),
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/rhel/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ write_files:
- path: "/etc/systemd/system/kubelet.service"
content: |
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .KubeletCloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
- path: "/etc/kubernetes/cloud-config"
permissions: "0600"
Expand Down
21 changes: 11 additions & 10 deletions pkg/userdata/rhel/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,16 +241,17 @@ func TestUserDataGeneration(t *testing.T) {
}

req := plugin.UserDataRequest{
MachineSpec: test.spec,
Kubeconfig: kubeconfig,
CloudConfig: cloudConfig,
CloudProviderName: cloudProviderName,
DNSIPs: test.clusterDNSIPs,
ExternalCloudProvider: test.externalCloudProvider,
HTTPProxy: test.httpProxy,
NoProxy: test.noProxy,
PauseImage: test.pauseImage,
KubeletFeatureGates: kubeletFeatureGates,
MachineSpec: test.spec,
Kubeconfig: kubeconfig,
CloudConfig: cloudConfig,
CloudProviderName: cloudProvider.name,
KubeletCloudProviderName: cloudProviderName,
DNSIPs: test.clusterDNSIPs,
ExternalCloudProvider: test.externalCloudProvider,
HTTPProxy: test.httpProxy,
NoProxy: test.noProxy,
PauseImage: test.pauseImage,
KubeletFeatureGates: kubeletFeatureGates,
ContainerRuntime: containerruntime.Get(
test.containerruntime,
containerruntime.WithInsecureRegistries(test.insecureRegistries),
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/sles/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ write_files:
- path: "/etc/systemd/system/kubelet.service"
content: |
{{ kubeletSystemdUnit .ContainerRuntime.String .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
{{ kubeletSystemdUnit .ContainerRuntime.String .KubeletVersion .KubeletCloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
- path: "/etc/systemd/system/kubelet.service.d/extras.conf"
content: |
Expand Down
24 changes: 12 additions & 12 deletions pkg/userdata/sles/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import (
"github.com/kubermatic/machine-controller/pkg/containerruntime"
providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
testhelper "github.com/kubermatic/machine-controller/pkg/test"
"github.com/kubermatic/machine-controller/pkg/userdata/cloud"
"github.com/kubermatic/machine-controller/pkg/userdata/convert"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -110,7 +109,7 @@ func (p *fakeCloudConfigProvider) GetCloudConfig(spec clusterv1alpha1.MachineSpe
type userDataTestCase struct {
name string
spec clusterv1alpha1.MachineSpec
ccProvider cloud.ConfigProvider
ccProvider *fakeCloudConfigProvider
osConfig *Config
providerSpec *providerconfigtypes.Config
DNSIPs []net.IP
Expand Down Expand Up @@ -438,16 +437,17 @@ func TestUserDataGeneration(t *testing.T) {
}

req := plugin.UserDataRequest{
MachineSpec: test.spec,
Kubeconfig: kubeconfig,
CloudConfig: cloudConfig,
CloudProviderName: cloudProviderName,
DNSIPs: test.DNSIPs,
ExternalCloudProvider: test.externalCloudProvider,
HTTPProxy: test.httpProxy,
NoProxy: test.noProxy,
PauseImage: test.pauseImage,
KubeletFeatureGates: kubeletFeatureGates,
MachineSpec: test.spec,
Kubeconfig: kubeconfig,
CloudConfig: cloudConfig,
CloudProviderName: test.ccProvider.name,
KubeletCloudProviderName: cloudProviderName,
DNSIPs: test.DNSIPs,
ExternalCloudProvider: test.externalCloudProvider,
HTTPProxy: test.httpProxy,
NoProxy: test.noProxy,
PauseImage: test.pauseImage,
KubeletFeatureGates: kubeletFeatureGates,
ContainerRuntime: containerruntime.Get(
test.containerruntime,
containerruntime.WithInsecureRegistries(test.insecureRegistries),
Expand Down
2 changes: 1 addition & 1 deletion pkg/userdata/ubuntu/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ write_files:
- path: "/etc/systemd/system/kubelet.service"
content: |
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .CloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
{{ kubeletSystemdUnit .ContainerRuntimeName .KubeletVersion .KubeletCloudProviderName .MachineSpec.Name .DNSIPs .ExternalCloudProvider .PauseImage .MachineSpec.Taints .ExtraKubeletFlags | indent 4 }}
- path: "/etc/systemd/system/kubelet.service.d/extras.conf"
content: |
Expand Down
24 changes: 12 additions & 12 deletions pkg/userdata/ubuntu/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import (
"github.com/kubermatic/machine-controller/pkg/containerruntime"
providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
testhelper "github.com/kubermatic/machine-controller/pkg/test"
"github.com/kubermatic/machine-controller/pkg/userdata/cloud"
"github.com/kubermatic/machine-controller/pkg/userdata/convert"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -109,7 +108,7 @@ func (p *fakeCloudConfigProvider) GetCloudConfig(spec clusterv1alpha1.MachineSpe
type userDataTestCase struct {
name string
spec clusterv1alpha1.MachineSpec
ccProvider cloud.ConfigProvider
ccProvider *fakeCloudConfigProvider
osConfig *Config
providerSpec *providerconfigtypes.Config
DNSIPs []net.IP
Expand Down Expand Up @@ -474,16 +473,17 @@ func TestUserDataGeneration(t *testing.T) {
}

req := plugin.UserDataRequest{
MachineSpec: test.spec,
Kubeconfig: kubeconfig,
CloudConfig: cloudConfig,
CloudProviderName: cloudProviderName,
DNSIPs: test.DNSIPs,
ExternalCloudProvider: test.externalCloudProvider,
HTTPProxy: test.httpProxy,
NoProxy: test.noProxy,
PauseImage: test.pauseImage,
KubeletFeatureGates: kubeletFeatureGates,
MachineSpec: test.spec,
Kubeconfig: kubeconfig,
CloudConfig: cloudConfig,
CloudProviderName: test.ccProvider.name,
KubeletCloudProviderName: cloudProviderName,
DNSIPs: test.DNSIPs,
ExternalCloudProvider: test.externalCloudProvider,
HTTPProxy: test.httpProxy,
NoProxy: test.noProxy,
PauseImage: test.pauseImage,
KubeletFeatureGates: kubeletFeatureGates,
ContainerRuntime: containerruntime.Get(
test.containerruntime,
containerruntime.WithInsecureRegistries(test.insecureRegistries),
Expand Down

0 comments on commit 1a94433

Please sign in to comment.