fix conflict

Signed-off-by: Ryan Lo <[email protected]>
flyteorg · Mar 7, 2024 · 20f59d0 · 20f59d0
1 parent e2f5e74
commit 20f59d0
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/deployment/eks/flyte_aws_scheduler_helm_generated.yaml b/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
@@ -1431,7 +1431,7 @@ spec:
           secret:
             secretName: flyte-pod-webhook
 ---
-# Source: flyte-core/templates/common/ingress-separateGrpc.yaml
+# Source: flyte-core/templates/common/ingress-grpc.yaml
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

diff --git a/deployment/eks/flyte_helm_controlplane_generated.yaml b/deployment/eks/flyte_helm_controlplane_generated.yaml
@@ -1052,7 +1052,7 @@ spec:
         secret:
           secretName: flyte-secret-auth
 ---
-# Source: flyte-core/templates/common/ingress-separateGrpc.yaml
+# Source: flyte-core/templates/common/ingress-grpc.yaml
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

diff --git a/deployment/eks/flyte_helm_dataplane_generated.yaml b/deployment/eks/flyte_helm_dataplane_generated.yaml
@@ -591,7 +591,7 @@ spec:
           secret:
             secretName: flyte-pod-webhook
 ---
-# Source: flyte-core/templates/common/ingress-separateGrpc.yaml
+# Source: flyte-core/templates/common/ingress-grpc.yaml
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

diff --git a/deployment/eks/flyte_helm_generated.yaml b/deployment/eks/flyte_helm_generated.yaml
@@ -1561,7 +1561,7 @@ spec:
           secret:
             secretName: flyte-pod-webhook
 ---
-# Source: flyte-core/templates/common/ingress-separateGrpc.yaml
+# Source: flyte-core/templates/common/ingress-grpc.yaml
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

diff --git a/deployment/gcp/flyte_helm_controlplane_generated.yaml b/deployment/gcp/flyte_helm_controlplane_generated.yaml
@@ -1067,7 +1067,7 @@ spec:
         secret:
           secretName: flyte-secret-auth
 ---
-# Source: flyte-core/templates/common/ingress-separateGrpc.yaml
+# Source: flyte-core/templates/common/ingress-grpc.yaml
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

diff --git a/deployment/gcp/flyte_helm_dataplane_generated.yaml b/deployment/gcp/flyte_helm_dataplane_generated.yaml
@@ -598,7 +598,7 @@ spec:
           secret:
             secretName: flyte-pod-webhook
 ---
-# Source: flyte-core/templates/common/ingress-separateGrpc.yaml
+# Source: flyte-core/templates/common/ingress-grpc.yaml
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

diff --git a/deployment/gcp/flyte_helm_generated.yaml b/deployment/gcp/flyte_helm_generated.yaml
@@ -1583,7 +1583,7 @@ spec:
           secret:
             secretName: flyte-pod-webhook
 ---
-# Source: flyte-core/templates/common/ingress-separateGrpc.yaml
+# Source: flyte-core/templates/common/ingress-grpc.yaml
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata: