Skip to content

Add node affinity to kit substrate components #178

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

Merged
merged 2 commits into from
Apr 13, 2022
Merged

Add node affinity to kit substrate components #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0273a59
Add node affinity to kit substrate components
felix-zhe-huang Apr 7, 2022
38a7650
Implement review comments
felix-zhe-huang Apr 12, 2022
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
14 changes: 13 additions & 1 deletion operator/charts/kit-operator/templates/controller/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,16 @@ spec:
memory: 20Mi
# https://github.com/aws/amazon-eks-pod-identity-webhook/issues/8#issuecomment-636888074
securityContext:
fsGroup: 1000
fsGroup: 1000
{{- with .Values.controller.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.controller.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.controller.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
15 changes: 14 additions & 1 deletion operator/charts/kit-operator/templates/webhook/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,17 @@ spec:
fieldPath: metadata.namespace
# https://github.com/aws/amazon-eks-pod-identity-webhook/issues/8#issuecomment-636888074
securityContext:
fsGroup: 1000
fsGroup: 1000
{{- with .Values.webhook.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.webhook.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.webhook.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}

2 changes: 1 addition & 1 deletion operator/charts/kit-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ webhook:
tolerations: []
affinity: {}
# TODO this will be updated by the git actions
image: "public.ecr.aws/kit/kit-webhook:latest"
image: "public.ecr.aws/kit/kit-webhook:latest"
8 changes: 6 additions & 2 deletions substrate/pkg/controller/substrate/cluster/addons/kitoperator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,13 @@ func (l *KITOperator) Create(ctx context.Context, substrate *v1alpha1.Substrate)
if err := helm.NewClient(*substrate.Status.Cluster.KubeConfig).Apply(ctx, &helm.Chart{
Namespace: "kit",
Name: "kit-operator",
Repository: "https://github.com/awslabs/kubernetes-iteration-toolkit/releases/download/kit-operator-0.0.12",
Version: "0.0.12",
Repository: "https://github.com/awslabs/kubernetes-iteration-toolkit/releases/download/latest",
Version: "latest",
CreateNamespace: true,
Values: map[string]interface{}{
"controller": map[string]interface{}{"nodeSelector": map[string]interface{}{"kit.aws/substrate": "control-plane"}},
"webhook": map[string]interface{}{"nodeSelector": map[string]interface{}{"kit.aws/substrate": "control-plane"}},
},
}); err != nil {
return reconcile.Result{}, fmt.Errorf("applying chart, %w", err)
}
Expand Down
5 changes: 3 additions & 2 deletions substrate/pkg/controller/substrate/cluster/addons/prometheusstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ func (p *PrometheusStack) Create(ctx context.Context, substrate *v1alpha1.Substr
"kubeApiServer": map[string]interface{}{"enabled": false},
"kubeStateMetrics": map[string]interface{}{"enabled": false},
"kubeControllerManager": map[string]interface{}{"enabled": false},
"prometheus": map[string]interface{}{"serviceMonitor": map[string]interface{}{"selfMonitor": false}},
"prometheusOperator": map[string]interface{}{"serviceMonitor": map[string]interface{}{"selfMonitor": false}},
"prometheus": map[string]interface{}{"serviceMonitor": map[string]interface{}{"selfMonitor": false}, "prometheusSpec": map[string]interface{}{"nodeSelector": map[string]interface{}{"kit.aws/substrate": "control-plane"}}},
"prometheusOperator": map[string]interface{}{"serviceMonitor": map[string]interface{}{"selfMonitor": false}, "nodeSelector": map[string]interface{}{"kit.aws/substrate": "control-plane"}},
"grafana": map[string]interface{}{"nodeSelector": map[string]interface{}{"kit.aws/substrate": "control-plane"}},
},
}); err != nil {
return reconcile.Result{}, fmt.Errorf("applying chart, %w", err)
Expand Down