Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move istio-ingressgateway to Yorkie Namespace #836

Merged
merged 1 commit into from
Apr 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build/charts/yorkie-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Installs the yorkie-cluster, which provides cluster mode for Yorkie server to ha
Before installing the chart, you need to install Istio with [Istio Operator](https://istio.io/latest/docs/setup/install/operator/) using [istioctl](https://istio.io/latest/docs/setup/getting-started/#download).

```bash
kubectl create namespace yorkie
istioctl install -f <(curl -s https://raw.githubusercontent.com/yorkie-team/yorkie/main/build/charts/yorkie-cluster/istio-operator.yaml)
```

Expand Down Expand Up @@ -50,6 +51,7 @@ Also, you need to uninstall istio with [istioctl](https://istio.io/latest/docs/s

```bash
istioctl uninstall --purge
kubectl delete namespace yorkie
```

This will remove all the istio components including CRDs.
Expand Down
7 changes: 6 additions & 1 deletion build/charts/yorkie-cluster/istio-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: install.istio.io/v1alpha1
kind: IstioOperator
metadata:
name: istio-operator
name: yorkie-gateway-operator
namespace: istio-system
spec:
profile: default
Expand All @@ -11,7 +11,12 @@ spec:
components:
ingressGateways:
- name: istio-ingressgateway
enabled: false
- name: yorkie-gateway
namespace: yorkie
enabled: true
label:
istio: yorkie-gateway
k8s:
service:
type: NodePort
Expand Down
3 changes: 1 addition & 2 deletions build/charts/yorkie-cluster/templates/istio/gateway.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ metadata:
name: {{ .Values.yorkie.name }}-gateway
namespace: {{ .Values.yorkie.namespace }}
spec:
# use istio default controller
selector:
istio: ingressgateway
istio: yorkie-gateway
servers:
- port:
number: 80
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apiVersion: networking.istio.io/v1alpha3
kind: EnvoyFilter
metadata:
name: ingress-stream-idle-timeout-filter
namespace: istio-system
namespace: {{ .Values.yorkie.namespace }}
spec:
workloadSelector:
labels:
istio: ingressgateway
istio: yorkie-gateway
configPatches:
- applyTo: NETWORK_FILTER
match:
Expand All @@ -26,11 +26,11 @@ apiVersion: networking.istio.io/v1alpha3
kind: EnvoyFilter
metadata:
name: ingress-shard-key-header-filter
namespace: istio-system
namespace: {{ .Values.yorkie.namespace }}
spec:
workloadSelector:
labels:
istio: ingressgateway
istio: yorkie-gateway
configPatches:
- applyTo: HTTP_FILTER
match:
Expand Down
4 changes: 2 additions & 2 deletions build/charts/yorkie-cluster/templates/istio/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ .Values.yorkie.name }}
namespace: istio-system
namespace: {{ .Values.yorkie.namespace }}
{{ if .Values.ingress.alb.enabled }}
annotations:
alb.ingress.kubernetes.io/scheme: internet-facing
Expand All @@ -29,6 +29,6 @@ spec:
pathType: Prefix
backend:
service:
name: istio-ingressgateway
name: yorkie-gateway
port:
number: 80
9 changes: 0 additions & 9 deletions build/charts/yorkie-cluster/templates/yorkie/namespace.yaml

This file was deleted.

Loading