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

[YUNIKORN-2626] Add flag to helm chart to disable web container #178

Closed
wants to merge 3 commits into from
Closed

[YUNIKORN-2626] Add flag to helm chart to disable web container #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57f0c99
[YUNIKORN-2626] Add flag to helm chart to disable web container
blueBlue0102 Jun 7, 2024
3d3d3c5
disable ingress when `enableWebService` is `false`
blueBlue0102 Jun 9, 2024
6e36f2c
format table
blueBlue0102 Jun 9, 2024
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
3 changes: 2 additions & 1 deletion helm-charts/yunikorn/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ helm install yunikorn yunikorn/yunikorn
The following table lists the configurable parameters of the YuniKorn chart and their default values:

| Parameter | Description | Default |
|-------------------------------------------------|-------------------------------------------------------------|---------------------------------|
| ----------------------------------------------- | ----------------------------------------------------------- | ------------------------------- |
| `imagePullSecrets` | Docker repository secrets | `[]` |
| `serviceAccount` | Service account name | `yunikorn-admin` |
| `hostNetwork` | Whether scheduler should run in the host network | `false` |
Expand Down Expand Up @@ -106,6 +106,7 @@ The following table lists the configurable parameters of the YuniKorn chart and
| `web.resources.limits.memory` | Web app memory resource limit | `500Mi` |
| `embedAdmissionController` | Flag for enabling/disabling the admission controller | `true` |
| `enableSchedulerPlugin` | Flag for enabling/disabling scheduler plugin mode | `false` |
| `enableWebService` | Flag for enabling/disabling web service | `true` |
| `nodeSelector` | Scheduler deployment nodeSelector(s) | `{}` |
| `tolerations` | Scheduler deployment tolerations | `[]` |
| `affinity` | Scheduler deployment affinity | `{}` |
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/yunikorn/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ spec:
fieldPath: metadata.namespace
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- if .Values.enableWebService }}
- name: yunikorn-scheduler-web
image: "{{ .Values.web.image.repository }}:{{ .Values.web.image.tag }}"
imagePullPolicy: {{ .Values.web.image.pullPolicy }}
Expand All @@ -104,3 +105,4 @@ spec:
protocol: TCP
resources:
{{- toYaml .Values.web.resources | nindent 12 }}
{{- end }}
2 changes: 1 addition & 1 deletion helm-charts/yunikorn/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

{{- if .Values.ingress.enabled }}
{{- if and .Values.ingress.enabled .Values.enableWebService }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/yunikorn/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@ spec:
targetPort: http1
protocol: TCP
name: yunikorn-core
{{- if .Values.enableWebService }}
Copy link
Member

Choose a reason for hiding this comment

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

Could you please apply it to ingress also? If there is no web port, we don't need to configure ingress, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay! I have applied the changes to the ingress.

- port: {{ .Values.service.portWeb }}
targetPort: http2
protocol: TCP
name: yunikorn-service
{{- end }}
selector:
app: yunikorn
component: yunikorn-scheduler
Expand Down
4 changes: 4 additions & 0 deletions helm-charts/yunikorn/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,9 @@ embedAdmissionController: true
# When this flag is false, the scheduler will be deployed as a standalone scheduler.
enableSchedulerPlugin: false

# When this flag is true, the web service will be deployed.
# When this flag is false, the web service will not be deployed.
enableWebService: true

podLabels: {}
podAnnotations: {}
Loading