Skip to content

Commit

Permalink
Create all ingresses always, independent of active cluster (#1213)
Browse files Browse the repository at this point in the history 
* Update test to validate all ingresses are created

* cleanup

* bump helm chart
  • Loading branch information
@Richard87
Richard87 authored Oct 22, 2024
1 parent 3c4e682 commit b1c8831
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 40 deletions.
4 changes: 2 additions & 2 deletions charts/radix-operator/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: radix-operator
version: 1.43.2
appVersion: 1.63.2
version: 1.43.3
appVersion: 1.63.3
kubeVersion: ">=1.24.0"
description: Radix Operator
keywords:
Expand Down
95 changes: 82 additions & 13 deletions pkg/apis/deployment/deployment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ func getDeploymentsForRadixJobAux(deployments []appsv1.Deployment) []appsv1.Depl
})
}

func TestObjectSynced_MultiComponent_NonActiveCluster_ContainsOnlyClusterSpecificIngresses(t *testing.T) {
func TestObjectSynced_MultiComponent_AllClusters_ContainsAllIngresses(t *testing.T) {
tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, _, certClient := SetupTest(t)
defer TeardownTest()
os.Setenv(defaults.ActiveClusternameEnvironmentVariable, "AnotherClusterName")
Expand Down Expand Up @@ -824,11 +824,20 @@ func TestObjectSynced_MultiComponent_NonActiveCluster_ContainsOnlyClusterSpecifi
envNamespace := utils.GetEnvironmentNamespace("edcradix", "test")

ingresses, _ := client.NetworkingV1().Ingresses(envNamespace).List(context.Background(), metav1.ListOptions{})
assert.Equal(t, 2, len(ingresses.Items), "Only cluster specific ingresses for the two public components should appear")
assert.Truef(t, ingressByNameExists("app", ingresses), "Cluster specific ingress for public component should exist")
assert.Truef(t, ingressByNameExists("radixquote", ingresses), "Cluster specific ingress for public component should exist")
assert.Equal(t, 7, len(ingresses.Items), "All ingresses for the two public components should appear")
require.Truef(t, ingressByNameExists("app", ingresses), "All ingresses for public component should exist")
require.Truef(t, ingressByNameExists("radixquote", ingresses), "All ingresses for public component should exist")

require.Truef(t, ingressByNameExists("some.alias.com", ingresses), "All ingresses for public component should exist")
require.Truef(t, ingressByNameExists("another.alias.com", ingresses), "All ingresses for public component should exist")
require.Truef(t, ingressByNameExists("edcradix-url-alias", ingresses), "All ingresses for public component should exist")

require.Truef(t, ingressByNameExists("app-active-cluster-url-alias", ingresses), "All ingresses for public component should exist")
require.Truef(t, ingressByNameExists("radixquote-active-cluster-url-alias", ingresses), "All ingresses for public component should exist")

appIngress := getIngressByName("app", ingresses)
assert.Equal(t, "app-edcradix-test.AnyClusterName.dev.radix.equinor.com", appIngress.Spec.Rules[0].Host)
assert.Equal(t, "app-edcradix-test.AnyClusterName.dev.radix.equinor.com", appIngress.Spec.TLS[0].Hosts[0])
assert.Equal(t, int32(8080), appIngress.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0].Backend.Service.Port.Number, "Port was unexpected")
assert.Empty(t, appIngress.Labels[kube.RadixAppAliasLabel], "Ingress should not be an app alias")
assert.Empty(t, appIngress.Labels[kube.RadixExternalAliasLabel], "Ingress should not be an external app alias")
Expand All @@ -837,12 +846,65 @@ func TestObjectSynced_MultiComponent_NonActiveCluster_ContainsOnlyClusterSpecifi
assert.Equal(t, "app", appIngress.Labels[kube.RadixComponentLabel], "Ingress should have the corresponding component")

quoteIngress := getIngressByName("radixquote", ingresses)
assert.Equal(t, "radixquote-edcradix-test.AnyClusterName.dev.radix.equinor.com", quoteIngress.Spec.Rules[0].Host)
assert.Equal(t, "radixquote-edcradix-test.AnyClusterName.dev.radix.equinor.com", quoteIngress.Spec.TLS[0].Hosts[0])
assert.Equal(t, int32(3000), quoteIngress.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0].Backend.Service.Port.Number, "Port was unexpected")
assert.Empty(t, quoteIngress.Labels[kube.RadixAppAliasLabel], "Ingress should not be an app alias")
assert.Empty(t, quoteIngress.Labels[kube.RadixExternalAliasLabel], "Ingress should not be an external app alias")
assert.Empty(t, quoteIngress.Labels[kube.RadixActiveClusterAliasLabel], "Ingress should not be an active cluster alias")
assert.Equal(t, "true", quoteIngress.Labels[kube.RadixDefaultAliasLabel], "Ingress should be default")
assert.Equal(t, "radixquote", quoteIngress.Labels[kube.RadixComponentLabel], "Ingress should have the corresponding component")

someAliasIngress := getIngressByName("some.alias.com", ingresses)
assert.Equal(t, "some.alias.com", someAliasIngress.Spec.Rules[0].Host)
assert.Equal(t, "some.alias.com", someAliasIngress.Spec.TLS[0].Hosts[0])
assert.Equal(t, int32(8080), someAliasIngress.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0].Backend.Service.Port.Number, "Port was unexpected")
assert.Empty(t, someAliasIngress.Labels[kube.RadixAppAliasLabel], "Ingress should not be an app alias")
assert.Empty(t, someAliasIngress.Labels[kube.RadixActiveClusterAliasLabel], "Ingress should not be an active cluster alias")
assert.Empty(t, someAliasIngress.Labels[kube.RadixDefaultAliasLabel], "Ingress should not be default")
assert.Equal(t, "true", someAliasIngress.Labels[kube.RadixExternalAliasLabel], "Ingress should be an external app alias")
assert.Equal(t, "app", someAliasIngress.Labels[kube.RadixComponentLabel], "Ingress should have the corresponding component")

anotherAliasIngress := getIngressByName("another.alias.com", ingresses)
assert.Equal(t, "another.alias.com", anotherAliasIngress.Spec.Rules[0].Host)
assert.Equal(t, "another.alias.com", anotherAliasIngress.Spec.TLS[0].Hosts[0])
assert.Equal(t, int32(8080), anotherAliasIngress.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0].Backend.Service.Port.Number, "Port was unexpected")
assert.Empty(t, anotherAliasIngress.Labels[kube.RadixAppAliasLabel], "Ingress should not be an app alias")
assert.Empty(t, anotherAliasIngress.Labels[kube.RadixActiveClusterAliasLabel], "Ingress should not be an active cluster alias")
assert.Empty(t, anotherAliasIngress.Labels[kube.RadixDefaultAliasLabel], "Ingress should not be default")
assert.Equal(t, "true", anotherAliasIngress.Labels[kube.RadixExternalAliasLabel], "Ingress should not be an external app alias")
assert.Equal(t, "app", anotherAliasIngress.Labels[kube.RadixComponentLabel], "Ingress should have the corresponding component")

edcIngress := getIngressByName("edcradix-url-alias", ingresses)
assert.Equal(t, "edcradix.app.dev.radix.equinor.com", edcIngress.Spec.Rules[0].Host)
assert.Equal(t, "edcradix.app.dev.radix.equinor.com", edcIngress.Spec.TLS[0].Hosts[0])
assert.Equal(t, int32(8080), edcIngress.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0].Backend.Service.Port.Number, "Port was unexpected")
assert.Empty(t, edcIngress.Labels[kube.RadixExternalAliasLabel], "Ingress should not be an external app alias")
assert.Empty(t, edcIngress.Labels[kube.RadixActiveClusterAliasLabel], "Ingress should not be an active cluster alias")
assert.Empty(t, edcIngress.Labels[kube.RadixDefaultAliasLabel], "Ingress should not be default")
assert.Equal(t, "true", edcIngress.Labels[kube.RadixAppAliasLabel], "Ingress should be an app alias")
assert.Equal(t, "app", edcIngress.Labels[kube.RadixComponentLabel], "Ingress should have the corresponding component")

appActiveAliasIngress := getIngressByName("app-active-cluster-url-alias", ingresses)
assert.Equal(t, "app-edcradix-test.dev.radix.equinor.com", appActiveAliasIngress.Spec.Rules[0].Host)
assert.Equal(t, "app-edcradix-test.dev.radix.equinor.com", appActiveAliasIngress.Spec.TLS[0].Hosts[0])
assert.Equal(t, int32(8080), appActiveAliasIngress.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0].Backend.Service.Port.Number, "Port was unexpected")
assert.Empty(t, appActiveAliasIngress.Labels[kube.RadixAppAliasLabel], "Ingress should not be an app alias")
assert.Empty(t, appActiveAliasIngress.Labels[kube.RadixExternalAliasLabel], "Ingress should not be an external app alias")
assert.Empty(t, appActiveAliasIngress.Labels[kube.RadixDefaultAliasLabel], "Ingress should not be default")
assert.Equal(t, "true", appActiveAliasIngress.Labels[kube.RadixActiveClusterAliasLabel], "Ingress should be an active cluster alias")
assert.Equal(t, "app", appActiveAliasIngress.Labels[kube.RadixComponentLabel], "Ingress should have the corresponding component")

radixQuoteIngress := getIngressByName("radixquote-active-cluster-url-alias", ingresses)
assert.Equal(t, "radixquote-edcradix-test.dev.radix.equinor.com", radixQuoteIngress.Spec.Rules[0].Host)
assert.Equal(t, "radixquote-edcradix-test.dev.radix.equinor.com", radixQuoteIngress.Spec.TLS[0].Hosts[0])
assert.Equal(t, int32(3000), radixQuoteIngress.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0].Backend.Service.Port.Number, "Port was unexpected")
assert.Empty(t, radixQuoteIngress.Labels[kube.RadixAppAliasLabel], "Ingress should not be an app alias")
assert.Empty(t, radixQuoteIngress.Labels[kube.RadixExternalAliasLabel], "Ingress should not be an external app alias")
assert.Empty(t, radixQuoteIngress.Labels[kube.RadixDefaultAliasLabel], "Ingress should not be default")
assert.Equal(t, "true", radixQuoteIngress.Labels[kube.RadixActiveClusterAliasLabel], "Ingress should be an active cluster alias")
assert.Equal(t, "radixquote", radixQuoteIngress.Labels[kube.RadixComponentLabel], "Ingress should have the corresponding component")

}

func TestObjectSynced_ReadOnlyFileSystem(t *testing.T) {
Expand Down Expand Up @@ -1283,7 +1345,7 @@ func TestObjectSynced_MultiComponentWithSameName_ContainsOneComponent(t *testing
assert.Equal(t, 1, len(expectedServices), "Number of services wasn't as expected")

ingresses, _ := client.NetworkingV1().Ingresses(envNamespace).List(context.Background(), metav1.ListOptions{})
assert.Equal(t, 1, len(ingresses.Items), "Number of ingresses was not according to public components")
assert.Equal(t, 2, len(ingresses.Items), "Number of ingresses was not according to public components")
}

func TestConfigMap_IsGarbageCollected(t *testing.T) {
Expand Down Expand Up @@ -2242,7 +2304,7 @@ func TestObjectSynced_PublicToNonPublic_HandlesChange(t *testing.T) {
require.NoError(t, err)
envNamespace := utils.GetEnvironmentNamespace(anyAppName, anyEnvironmentName)
ingresses, _ := client.NetworkingV1().Ingresses(envNamespace).List(context.Background(), metav1.ListOptions{})
assert.Equal(t, 2, len(ingresses.Items), "Both components should be public")
assert.Equal(t, 4, len(ingresses.Items), "Both components should be public")

// Remove public on component 2
_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
Expand All @@ -2259,7 +2321,7 @@ func TestObjectSynced_PublicToNonPublic_HandlesChange(t *testing.T) {
WithPublicPort("")))
require.NoError(t, err)
ingresses, _ = client.NetworkingV1().Ingresses(envNamespace).List(context.Background(), metav1.ListOptions{})
assert.Equal(t, 1, len(ingresses.Items), "Only component 1 should be public")
assert.Equal(t, 2, len(ingresses.Items), "Only component 1 should be public")

// Remove public on component 1
_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
Expand Down Expand Up @@ -2303,8 +2365,9 @@ func TestObjectSynced_PublicPort_OldPublic(t *testing.T) {
assert.NoError(t, err)
envNamespace := utils.GetEnvironmentNamespace(anyAppName, anyEnvironmentName)
ingresses, _ := client.NetworkingV1().Ingresses(envNamespace).List(context.Background(), metav1.ListOptions{})
assert.Equal(t, 1, len(ingresses.Items), "Component should be public")
assert.Equal(t, 2, len(ingresses.Items), "Component should be public")
assert.Equal(t, int32(80), ingresses.Items[0].Spec.Rules[0].HTTP.Paths[0].Backend.Service.Port.Number)
assert.Equal(t, int32(80), ingresses.Items[1].Spec.Rules[0].HTTP.Paths[0].Backend.Service.Port.Number)

// New publicPort exists, old public exists (ignored)
_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
Expand All @@ -2321,8 +2384,14 @@ func TestObjectSynced_PublicPort_OldPublic(t *testing.T) {

assert.NoError(t, err)
ingresses, _ = client.NetworkingV1().Ingresses(envNamespace).List(context.Background(), metav1.ListOptions{})
assert.Equal(t, 1, len(ingresses.Items), "Component should be public")
require.Equal(t, 2, len(ingresses.Items), "Component should be public, should have 2 ingresses, for canonical hostname and public hostname")
assert.Equal(t, int32(80), ingresses.Items[0].Spec.Rules[0].HTTP.Paths[0].Backend.Service.Port.Number)
assert.Equal(t, "componentOneName-anyappname-test.AnyClusterName.dev.radix.equinor.com", ingresses.Items[0].Spec.Rules[0].Host)
assert.Equal(t, []string{"componentOneName-anyappname-test.AnyClusterName.dev.radix.equinor.com"}, ingresses.Items[0].Spec.TLS[0].Hosts)

assert.Equal(t, int32(80), ingresses.Items[1].Spec.Rules[0].HTTP.Paths[0].Backend.Service.Port.Number)
assert.Equal(t, "componentOneName-anyappname-test.dev.radix.equinor.com", ingresses.Items[1].Spec.Rules[0].Host)
assert.Equal(t, []string{"componentOneName-anyappname-test.dev.radix.equinor.com"}, ingresses.Items[1].Spec.TLS[0].Hosts)

// New publicPort does not exist, old public does not exist
_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, utils.ARadixDeployment().
Expand Down Expand Up @@ -2357,9 +2426,9 @@ func TestObjectSynced_PublicPort_OldPublic(t *testing.T) {
assert.NoError(t, err)
ingresses, _ = client.NetworkingV1().Ingresses(envNamespace).List(context.Background(), metav1.ListOptions{})
expectedIngresses := getIngressesForRadixComponents(&ingresses.Items)
assert.Equal(t, 1, len(expectedIngresses), "Component should be public")
actualPortValue := ingresses.Items[0].Spec.Rules[0].HTTP.Paths[0].Backend.Service.Port.Number
assert.Equal(t, int32(443), actualPortValue)
assert.Equal(t, 2, len(expectedIngresses), "Component should be public")
assert.Equal(t, int32(443), ingresses.Items[0].Spec.Rules[0].HTTP.Paths[0].Backend.Service.Port.Number)
assert.Equal(t, int32(443), ingresses.Items[1].Spec.Rules[0].HTTP.Paths[0].Backend.Service.Port.Number)
}

func getIngressesForRadixComponents(ingresses *[]networkingv1.Ingress) []networkingv1.Ingress {
Expand Down Expand Up @@ -2554,7 +2623,7 @@ func TestFixedAliasIngress_ActiveCluster(t *testing.T) {
_, err = ApplyDeploymentWithSync(tu, client, kubeUtil, radixclient, kedaClient, prometheusclient, certClient, radixDeployBuilder)
require.NoError(t, err)
ingresses, _ = client.NetworkingV1().Ingresses(envNamespace).List(context.Background(), metav1.ListOptions{})
assert.Equal(t, 1, len(ingresses.Items), "Environment should have one ingresses")
assert.Equal(t, 2, len(ingresses.Items), "Environment should have two ingresses (canonical+public) ingress")
assert.True(t, strings.Contains(ingresses.Items[0].Spec.Rules[0].Host, testClusterName))
}

Expand Down
27 changes: 2 additions & 25 deletions pkg/apis/deployment/ingress.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,6 @@ func (deploy *Deployment) createOrUpdateClusterIngress(ctx context.Context, depl
}

func (deploy *Deployment) createOrUpdateActiveClusterIngress(ctx context.Context, deployComponent radixv1.RadixCommonDeployComponent) error {
clustername, err := deploy.kubeutil.GetClusterName(ctx)
if err != nil {
return err
}

if !isActiveCluster(clustername) {
return deploy.garbageCollectNonActiveClusterIngress(ctx, deployComponent)
}

namespace := deploy.radixDeployment.Namespace
publicPortNumber := getPublicPortForComponent(deployComponent)

Expand All @@ -72,12 +63,7 @@ func (deploy *Deployment) createOrUpdateActiveClusterIngress(ctx context.Context
}

func (deploy *Deployment) createOrUpdateAppAliasIngress(ctx context.Context, deployComponent radixv1.RadixCommonDeployComponent) error {
clustername, err := deploy.kubeutil.GetClusterName(ctx)
if err != nil {
return err
}

if !deployComponent.IsDNSAppAlias() || !isActiveCluster(clustername) {
if !deployComponent.IsDNSAppAlias() {
return deploy.garbageCollectAppAliasIngressNoLongerInSpecForComponent(ctx, deployComponent)
}

Expand All @@ -93,14 +79,9 @@ func (deploy *Deployment) createOrUpdateAppAliasIngress(ctx context.Context, dep
}

func (deploy *Deployment) createOrUpdateExternalDNSIngresses(ctx context.Context, deployComponent radixv1.RadixCommonDeployComponent) error {
clustername, err := deploy.kubeutil.GetClusterName(ctx)
if err != nil {
return err
}

externalDNSList := deployComponent.GetExternalDNS()

if len(externalDNSList) == 0 || !isActiveCluster(clustername) {
if len(externalDNSList) == 0 {
return deploy.garbageCollectAllExternalAliasIngressesForComponent(ctx, deployComponent)
}

Expand Down Expand Up @@ -158,10 +139,6 @@ func (deploy *Deployment) garbageCollectIngressNoLongerInSpecForComponent(ctx co
return deploy.garbageCollectIngressByLabelSelectorForComponent(ctx, getLabelSelectorForComponent(component))
}

func (deploy *Deployment) garbageCollectNonActiveClusterIngress(ctx context.Context, component radixv1.RadixCommonDeployComponent) error {
return deploy.garbageCollectIngressByLabelSelectorForComponent(ctx, fmt.Sprintf("%s=%s, %s=%s", kube.RadixComponentLabel, component.GetName(), kube.RadixActiveClusterAliasLabel, "true"))
}

func (deploy *Deployment) garbageCollectIngressByLabelSelectorForComponent(ctx context.Context, labelSelector string) error {
ingresses, err := deploy.kubeutil.ListIngressesWithSelector(ctx, deploy.radixDeployment.GetNamespace(), labelSelector)
if err != nil {
Expand Down

0 comments on commit b1c8831

Please sign in to comment.