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.

Sign up for GitHub

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

Jump to bottom

update install manifest for aeraki #336

Closed
wants to merge 1 commit into from
+20 −20
Closed

update install manifest for aeraki #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion k8s/aeraki-bootstrap-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
apiVersion: v1
kind: ConfigMap
metadata:
annotations:
name: aeraki-bootstrap-config
data:
custom_bootstrap.json: |-
Expand Down
12 changes: 6 additions & 6 deletions k8s/aeraki.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ kind: Role
metadata:
labels:
app: aeraki
name: aeraki
name: aeraki-${AERAKI_NAMESPACE}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have to change the name?

Copy link
Member Author

@tanjunchen tanjunchen Apr 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not necessary, for installing multiple aeraki on the same cluster, this should be modified

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's ok to use the same name for multiple Aeraki deployments since they're in different namespaces.

Copy link
Member Author

@tanjunchen tanjunchen Apr 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Installing aeraki in different namespace, aeraki failed to start.
Refer to the istio document, it is recommended to use different clusterrole and clusterrolebinding.

namespace: ${AERAKI_NAMESPACE}
rules:
- apiGroups:
Expand All @@ -140,12 +140,12 @@ kind: RoleBinding
metadata:
labels:
app: aeraki
name: aeraki
name: aeraki-${AERAKI_NAMESPACE}
namespace: ${AERAKI_NAMESPACE}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: aeraki
name: aeraki-${AERAKI_NAMESPACE}
subjects:
- kind: ServiceAccount
name: aeraki
Expand All @@ -155,7 +155,7 @@ kind: ClusterRole
metadata:
labels:
app: aeraki
name: aeraki
name: aeraki-${AERAKI_NAMESPACE}
rules:
- apiGroups:
- ""
Expand Down Expand Up @@ -200,11 +200,11 @@ kind: ClusterRoleBinding
metadata:
labels:
app: aeraki
name: aeraki
name: aeraki-${AERAKI_NAMESPACE}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: aeraki
name: aeraki-${AERAKI_NAMESPACE}
subjects:
- kind: ServiceAccount
name: aeraki
Expand Down
2 changes: 1 addition & 1 deletion manifests/charts/aeraki/templates/clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ kind: ClusterRole
metadata:
labels:
app: aeraki
name: aeraki
name: aeraki-{{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
rules:
- apiGroups:
- ""
Expand Down
6 changes: 3 additions & 3 deletions manifests/charts/aeraki/templates/clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ kind: ClusterRoleBinding
metadata:
labels:
app: aeraki
name: aeraki
name: aeraki-{{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: aeraki
name: aeraki-{{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
subjects:
- kind: ServiceAccount
name: aeraki
namespace: {{ .Release.Namespace }}
namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
2 changes: 1 addition & 1 deletion manifests/charts/aeraki/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: aeraki
namespace: {{ .Release.Namespace }}
namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
labels:
app: aeraki
spec:
Expand Down
4 changes: 2 additions & 2 deletions manifests/charts/aeraki/templates/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ kind: Role
metadata:
labels:
app: aeraki
name: aeraki
namespace: {{ .Release.Namespace }}
name: aeraki-{{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
rules:
- apiGroups:
- ""
Expand Down
6 changes: 3 additions & 3 deletions manifests/charts/aeraki/templates/rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ kind: RoleBinding
metadata:
labels:
app: aeraki
name: aeraki
namespace: {{ .Release.Namespace }}
name: aeraki-{{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: aeraki
name: aeraki-{{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
subjects:
- kind: ServiceAccount
name: aeraki
4 changes: 2 additions & 2 deletions manifests/charts/aeraki/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ apiVersion: v1
kind: Service
metadata:
name: aeraki
namespace: {{ .Release.Namespace }}
namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
labels:
app: aeraki
spec:
Expand All @@ -39,7 +39,7 @@ metadata:
labels:
app: aeraki
name: aeraki
namespace: {{ .Release.Namespace }}
namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
spec:
ports:
- name: grpc-xds
Expand Down
2 changes: 1 addition & 1 deletion manifests/charts/aeraki/templates/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: aeraki
namespace: {{ .Release.Namespace }}
namespace: {{ .Values.AERAKI_ENV.AERAKI_NAMESPACE }}
labels:
app: aeraki
{{- end }}
1 change: 1 addition & 0 deletions manifests/charts/aeraki/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ image:
tag: latest

AERAKI_ENV:
AERAKI_NAMESPACE: "istio-system"
AERAKI_IS_MASTER:
AERAKI_ISTIOD_ADDR: "istiod.istio-system:15010"
AERAKI_CLUSTER_ID:
Expand Down