Skip to content

Commit

Permalink
Remove the potential multiple managedclusterconfiguration support. (#202
Browse files Browse the repository at this point in the history 
)

Signed-off-by: GitHub <noreply@github.com>
  • Loading branch information
@xuezhaojun
xuezhaojun committed Jun 27, 2024
1 parent 5f9d93e commit 73d87ec
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 34 deletions.
18 changes: 3 additions & 15 deletions pkg/proxyagent/agent/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ import (
var FS embed.FS

const (
ManagedClusterConfigurationName = "cluster-proxy"

ProxyAgentSignerName = "open-cluster-management.io/proxy-agent-signer"

// serviceDomain must added because go dns client won't recursivly search CNAME.
Expand Down Expand Up @@ -175,23 +177,9 @@ func GetClusterProxyValueFunc(
) addonfactory.GetValuesFunc {
return func(cluster *clusterv1.ManagedCluster,
addon *addonv1alpha1.ManagedClusterAddOn) (addonfactory.Values, error) {

managedProxyConfigurations := []string{}
for _, configReference := range addon.Status.ConfigReferences {
if config.IsManagedProxyConfiguration(configReference.ConfigGroupResource) && configReference.DesiredConfig != nil {
managedProxyConfigurations = append(managedProxyConfigurations, configReference.DesiredConfig.Name)
}
}

// only handle there is only one managed proxy configuration for one addon
// TODO may consider to handle multiple managed proxy configurations for one addon
if len(managedProxyConfigurations) != 1 {
return nil, fmt.Errorf("unexpected managed proxy configurations: %v", managedProxyConfigurations)
}

proxyConfig := &proxyv1alpha1.ManagedProxyConfiguration{}
if err := runtimeClient.Get(context.TODO(), types.NamespacedName{
Name: managedProxyConfigurations[0],
Name: ManagedClusterConfigurationName,
}, proxyConfig); err != nil {
return nil, err
}
Expand Down
41 changes: 22 additions & 19 deletions pkg/proxyagent/agent/agent_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ func TestNewAgentAddon(t *testing.T) {
name string
cluster *clusterv1.ManagedCluster
addon *addonv1alpha1.ManagedClusterAddOn
managedProxyConfigs []runtimeclient.Object
managedProxyConfig runtimeclient.Object
addOndDeploymentConfigs []runtime.Object
kubeObjs []runtime.Object
v1CSRSupported bool
Expand All @@ -433,11 +433,10 @@ func TestNewAgentAddon(t *testing.T) {
{
name: "without default config",
addon: newAddOn(addOnName, clusterName),
managedProxyConfigs: []runtimeclient.Object{},
addOndDeploymentConfigs: []runtime.Object{},
kubeObjs: []runtime.Object{},
enableKubeApiProxy: true,
expectedErrorMsg: "unexpected managed proxy configurations: []",
expectedErrorMsg: "managedproxyconfigurations.proxy.open-cluster-management.io \"cluster-proxy\" not found",
verifyManifests: func(t *testing.T, manifests []runtime.Object) {},
},
{
Expand All @@ -447,11 +446,10 @@ func TestNewAgentAddon(t *testing.T) {
addOn.Status.ConfigReferences = []addonv1alpha1.ConfigReference{newManagedProxyConfigReference("none")}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{},
addOndDeploymentConfigs: []runtime.Object{},
kubeObjs: []runtime.Object{},
enableKubeApiProxy: true,
expectedErrorMsg: "managedproxyconfigurations.proxy.open-cluster-management.io \"none\" not found",
expectedErrorMsg: "managedproxyconfigurations.proxy.open-cluster-management.io \"cluster-proxy\" not found",
verifyManifests: func(t *testing.T, manifests []runtime.Object) {},
},
{
Expand All @@ -461,7 +459,7 @@ func TestNewAgentAddon(t *testing.T) {
addOn.Status.ConfigReferences = []addonv1alpha1.ConfigReference{newManagedProxyConfigReference(managedProxyConfigName)}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypeLoadBalancerService)},
managedProxyConfig: newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypeLoadBalancerService),
addOndDeploymentConfigs: []runtime.Object{},
kubeObjs: []runtime.Object{},
enableKubeApiProxy: true,
Expand All @@ -475,7 +473,7 @@ func TestNewAgentAddon(t *testing.T) {
addOn.Status.ConfigReferences = []addonv1alpha1.ConfigReference{newManagedProxyConfigReference(managedProxyConfigName)}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypeLoadBalancerService)},
managedProxyConfig: newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypeLoadBalancerService),
addOndDeploymentConfigs: []runtime.Object{},
kubeObjs: []runtime.Object{newLoadBalancerService("")},
enableKubeApiProxy: true,
Expand All @@ -490,7 +488,7 @@ func TestNewAgentAddon(t *testing.T) {
addOn.Status.ConfigReferences = []addonv1alpha1.ConfigReference{newManagedProxyConfigReference(managedProxyConfigName)}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypeLoadBalancerService)},
managedProxyConfig: newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypeLoadBalancerService),
addOndDeploymentConfigs: []runtime.Object{},
kubeObjs: []runtime.Object{newLoadBalancerService("1.2.3.4")},
v1CSRSupported: true,
Expand All @@ -511,7 +509,7 @@ func TestNewAgentAddon(t *testing.T) {
addOn.Status.ConfigReferences = []addonv1alpha1.ConfigReference{newManagedProxyConfigReference(managedProxyConfigName)}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypeLoadBalancerService)},
managedProxyConfig: newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypeLoadBalancerService),
addOndDeploymentConfigs: []runtime.Object{},
kubeObjs: []runtime.Object{newLoadBalancerService("1.2.3.4"), newAgentClientSecret()},
enableKubeApiProxy: true,
Expand All @@ -529,7 +527,7 @@ func TestNewAgentAddon(t *testing.T) {
addOn.Status.ConfigReferences = []addonv1alpha1.ConfigReference{newManagedProxyConfigReference(managedProxyConfigName)}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypeHostname)},
managedProxyConfig: newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypeHostname),
addOndDeploymentConfigs: []runtime.Object{},
kubeObjs: []runtime.Object{},
v1CSRSupported: true,
Expand All @@ -550,7 +548,7 @@ func TestNewAgentAddon(t *testing.T) {
addOn.Status.ConfigReferences = []addonv1alpha1.ConfigReference{newManagedProxyConfigReference(managedProxyConfigName)}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{setProxyAgentReplicas(newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypeHostname), 2)},
managedProxyConfig: setProxyAgentReplicas(newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypeHostname), 2),
addOndDeploymentConfigs: []runtime.Object{},
kubeObjs: []runtime.Object{},
v1CSRSupported: true,
Expand All @@ -571,7 +569,7 @@ func TestNewAgentAddon(t *testing.T) {
addOn.Status.ConfigReferences = []addonv1alpha1.ConfigReference{newManagedProxyConfigReference(managedProxyConfigName)}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward)},
managedProxyConfig: newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward),
addOndDeploymentConfigs: []runtime.Object{},
kubeObjs: []runtime.Object{},
v1CSRSupported: true,
Expand All @@ -595,7 +593,7 @@ func TestNewAgentAddon(t *testing.T) {
}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward)},
managedProxyConfig: newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward),
addOndDeploymentConfigs: []runtime.Object{newAddOnDeploymentConfig(addOndDeployConfigName, clusterName)},
v1CSRSupported: true,
enableKubeApiProxy: true,
Expand Down Expand Up @@ -632,7 +630,7 @@ func TestNewAgentAddon(t *testing.T) {
}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward)},
managedProxyConfig: newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward),
addOndDeploymentConfigs: []runtime.Object{newAddOnDeploymentConfigWithCustomizedServiceDomain(addOndDeployConfigName, clusterName, "svc.test.com")},
v1CSRSupported: true,
enableKubeApiProxy: true,
Expand All @@ -655,7 +653,7 @@ func TestNewAgentAddon(t *testing.T) {
}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward)},
managedProxyConfig: newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward),
addOndDeploymentConfigs: []runtime.Object{newAddOnDeploymentConfigWithCustomizedServiceDomain(addOndDeployConfigName, clusterName, "svc.test.com")},
v1CSRSupported: true,
enableKubeApiProxy: false,
Expand All @@ -676,7 +674,7 @@ func TestNewAgentAddon(t *testing.T) {
}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward)},
managedProxyConfig: newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward),
addOndDeploymentConfigs: []runtime.Object{newAddOnDeploymentConfigWithHttpsProxy(addOndDeployConfigName, clusterName)},
v1CSRSupported: true,
enableKubeApiProxy: true,
Expand Down Expand Up @@ -710,7 +708,7 @@ func TestNewAgentAddon(t *testing.T) {
}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward)},
managedProxyConfig: newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward),
addOndDeploymentConfigs: []runtime.Object{newAddOnDeploymentConfigWithHttpProxy(addOndDeployConfigName, clusterName)},
v1CSRSupported: true,
enableKubeApiProxy: true,
Expand Down Expand Up @@ -744,7 +742,7 @@ func TestNewAgentAddon(t *testing.T) {
}
return addOn
}(),
managedProxyConfigs: []runtimeclient.Object{newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward)},
managedProxyConfig: newManagedProxyConfig(managedProxyConfigName, proxyv1alpha1.EntryPointTypePortForward),
addOndDeploymentConfigs: []runtime.Object{
func() *addonv1alpha1.AddOnDeploymentConfig {
config := newAddOnDeploymentConfig(addOndDeployConfigName, clusterName)
Expand All @@ -764,7 +762,12 @@ func TestNewAgentAddon(t *testing.T) {
for _, c := range cases {
t.Run(c.name, func(t *testing.T) {
fakeKubeClient := fakekube.NewSimpleClientset(c.kubeObjs...)
fakeRuntimeClient := fakeruntime.NewClientBuilder().WithObjects(c.managedProxyConfigs...).Build()
var fakeRuntimeClient runtimeclient.Client
if c.managedProxyConfig == nil {
fakeRuntimeClient = fakeruntime.NewClientBuilder().Build()
} else {
fakeRuntimeClient = fakeruntime.NewClientBuilder().WithObjects(c.managedProxyConfig).Build()
}
fakeAddonClient := fakeaddon.NewSimpleClientset(c.addOndDeploymentConfigs...)

agentAddOn, err := NewAgentAddon(
Expand Down

0 comments on commit 73d87ec

Please sign in to comment.