Skip to content

Commit

Permalink
add maistra annotation to generated gateways to disable IOR
Browse files Browse the repository at this point in the history
  • Loading branch information
@ReToCode
ReToCode committed Jul 20, 2023
1 parent 9914eca commit c23d484
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 3 deletions.
96 changes: 96 additions & 0 deletions openshift/patches/002-add-maistra-annotation.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
diff --git a/pkg/reconciler/ingress/resources/gateway_test.go b/pkg/reconciler/ingress/resources/gateway_test.go
--- a/pkg/reconciler/ingress/resources/gateway_test.go (revision 9914eca315000a757b0f48df69f59cdbb8f7ea23)
+++ b/pkg/reconciler/ingress/resources/gateway_test.go (date 1689860320623)
@@ -593,6 +593,7 @@
Name: WildcardGatewayName(wildcardSecret.Name, "istio-system", "istio-ingressgateway"),
Namespace: system.Namespace(),
OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(wildcardSecret, secretGVK)},
+ Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
@@ -630,6 +631,7 @@
Name: WildcardGatewayName(wildcardSecret.Name, system.Namespace(), "istio-ingressgateway"),
Namespace: system.Namespace(),
OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(wildcardSecret, secretGVK)},
+ Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
@@ -743,6 +745,7 @@
Labels: map[string]string{
networking.IngressLabelKey: "ingress",
},
+ Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
@@ -761,6 +764,7 @@
Labels: map[string]string{
networking.IngressLabelKey: "ingress",
},
+ Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
@@ -824,6 +828,7 @@
Labels: map[string]string{
networking.IngressLabelKey: "ingress",
},
+ Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
@@ -866,6 +871,7 @@
Labels: map[string]string{
networking.IngressLabelKey: "ingress",
},
+ Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
@@ -908,6 +914,7 @@
Labels: map[string]string{
networking.IngressLabelKey: "ingress.com",
},
+ Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
diff --git a/pkg/reconciler/ingress/resources/gateway.go b/pkg/reconciler/ingress/resources/gateway.go
--- a/pkg/reconciler/ingress/resources/gateway.go (revision 9914eca315000a757b0f48df69f59cdbb8f7ea23)
+++ b/pkg/reconciler/ingress/resources/gateway.go (date 1689860314964)
@@ -42,9 +42,10 @@

// GatewayHTTPPort is the HTTP port the gateways listen on.
const (
- GatewayHTTPPort = 80
- dns1123LabelMaxLength = 63 // Public for testing only.
- dns1123LabelFmt = "[a-zA-Z0-9](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?"
+ GatewayHTTPPort = 80
+ dns1123LabelMaxLength = 63 // Public for testing only.
+ dns1123LabelFmt = "[a-zA-Z0-9](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?"
+ maistraManageRouteAnnotationKey = "maistra.io/manageRoute"
)

var httpServerPortName = "http-server"
@@ -199,6 +200,9 @@
Name: WildcardGatewayName(secret.Name, gatewayService.Namespace, gatewayService.Name),
Namespace: secret.Namespace,
OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(secret, gvk)},
+ Annotations: map[string]string{
+ maistraManageRouteAnnotationKey: "false",
+ },
},
Spec: istiov1beta1.Gateway{
Selector: gatewayService.Spec.Selector,
@@ -254,6 +258,9 @@
// We need this label to find out all of Gateways of a given Ingress.
networking.IngressLabelKey: ing.GetName(),
},
+ Annotations: map[string]string{
+ maistraManageRouteAnnotationKey: "false",
+ },
},
Spec: istiov1beta1.Gateway{
Selector: selector,
13 changes: 10 additions & 3 deletions pkg/reconciler/ingress/resources/gateway.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ import (

// GatewayHTTPPort is the HTTP port the gateways listen on.
const (
GatewayHTTPPort = 80
dns1123LabelMaxLength = 63 // Public for testing only.
dns1123LabelFmt = "[a-zA-Z0-9](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?"
GatewayHTTPPort = 80
dns1123LabelMaxLength = 63 // Public for testing only.
dns1123LabelFmt = "[a-zA-Z0-9](?:[-a-zA-Z0-9]*[a-zA-Z0-9])?"
maistraManageRouteAnnotationKey = "maistra.io/manageRoute"
)

var httpServerPortName = "http-server"
Expand Down Expand Up @@ -199,6 +200,9 @@ func makeWildcardTLSGateways(originWildcardSecrets map[string]*corev1.Secret,
Name: WildcardGatewayName(secret.Name, gatewayService.Namespace, gatewayService.Name),
Namespace: secret.Namespace,
OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(secret, gvk)},
Annotations: map[string]string{
maistraManageRouteAnnotationKey: "false",
},
},
Spec: istiov1beta1.Gateway{
Selector: gatewayService.Spec.Selector,
Expand Down Expand Up @@ -254,6 +258,9 @@ func makeIngressGateway(ing *v1alpha1.Ingress, selector map[string]string, serve
// We need this label to find out all of Gateways of a given Ingress.
networking.IngressLabelKey: ing.GetName(),
},
Annotations: map[string]string{
maistraManageRouteAnnotationKey: "false",
},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
Expand Down
7 changes: 7 additions & 0 deletions pkg/reconciler/ingress/resources/gateway_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@ func TestMakeWildcardGateways(t *testing.T) {
Name: WildcardGatewayName(wildcardSecret.Name, "istio-system", "istio-ingressgateway"),
Namespace: system.Namespace(),
OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(wildcardSecret, secretGVK)},
Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
Expand Down Expand Up @@ -630,6 +631,7 @@ func TestMakeWildcardGateways(t *testing.T) {
Name: WildcardGatewayName(wildcardSecret.Name, system.Namespace(), "istio-ingressgateway"),
Namespace: system.Namespace(),
OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(wildcardSecret, secretGVK)},
Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
Expand Down Expand Up @@ -743,6 +745,7 @@ func TestMakeIngressGateways(t *testing.T) {
Labels: map[string]string{
networking.IngressLabelKey: "ingress",
},
Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
Expand All @@ -761,6 +764,7 @@ func TestMakeIngressGateways(t *testing.T) {
Labels: map[string]string{
networking.IngressLabelKey: "ingress",
},
Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
Expand Down Expand Up @@ -824,6 +828,7 @@ func TestMakeIngressTLSGateways(t *testing.T) {
Labels: map[string]string{
networking.IngressLabelKey: "ingress",
},
Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
Expand Down Expand Up @@ -866,6 +871,7 @@ func TestMakeIngressTLSGateways(t *testing.T) {
Labels: map[string]string{
networking.IngressLabelKey: "ingress",
},
Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
Expand Down Expand Up @@ -908,6 +914,7 @@ func TestMakeIngressTLSGateways(t *testing.T) {
Labels: map[string]string{
networking.IngressLabelKey: "ingress.com",
},
Annotations: map[string]string{maistraManageRouteAnnotationKey: "false"},
},
Spec: istiov1beta1.Gateway{
Selector: selector,
Expand Down

0 comments on commit c23d484

Please sign in to comment.