Skip to content

Commit c321885

Browse files
jianxiaoguojianxiaoguo
committed
chore(addons): modify service type and allow_parameters
1 parent 7d0ef2a commit c321885

67 files changed

Lines changed: 756 additions & 46 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎addons/minio/2023/chart/minio/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ sidecars: []
573573
service:
574574
## @param service.type MinIO® service type
575575
##
576-
type: LoadBalancer
576+
type: ClusterIP
577577
## @param service.ports.api MinIO® API service port
578578
## @param service.ports.console MinIO® Console service port
579579
##

‎addons/minio/2023/meta.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ tags: minio
1313
bindable: true
1414
instances_retrievable: true
1515
bindings_retrievable: true
16-
plan_updateable: true
16+
plan_updateable: false
1717
allow_parameters:
1818
- name: "networkPolicy.allowNamespaces"
1919
description: "networkPolicy allowNamespaces config for values.yaml"
20+
- name: "service.type"
21+
description: "service type config for values.yaml"
22+
- name: "metrics.enable"
23+
description: "metrics enable or not config for values.yaml"
2024
archive: false

‎addons/minio/2023/plans/standard-v4s1024/bind.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ credential:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8+
{{- else if (eq .Values.service.type "ClusterIP") }}
9+
- name: HOST
10+
valueFrom:
11+
serviceRef:
12+
name: {{ include "common.names.fullname" . }}
13+
jsonpath: '{ .spec.clusterIP }'
14+
{{- end }}
815

916
- name: API_PORT
1017
valueFrom:
@@ -16,8 +23,7 @@ credential:
1623
valueFrom:
1724
serviceRef:
1825
name: {{ include "common.names.fullname" . }}
19-
jsonpath: '{ .spec.ports[?(@.name=="minio-console")].port }'
20-
{{- end }}
26+
jsonpath: '{ .spec.ports[?(@.name=="minio-console")].port }'
2127

2228
{{- if (include "minio.createSecret" .) }}
2329
- name: ROOT_USER

‎addons/minio/2023/plans/standard-v4s128/bind.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ credential:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8+
{{- else if (eq .Values.service.type "ClusterIP") }}
9+
- name: HOST
10+
valueFrom:
11+
serviceRef:
12+
name: {{ include "common.names.fullname" . }}
13+
jsonpath: '{ .spec.clusterIP }'
14+
{{- end }}
815

916
- name: API_PORT
1017
valueFrom:
@@ -16,8 +23,7 @@ credential:
1623
valueFrom:
1724
serviceRef:
1825
name: {{ include "common.names.fullname" . }}
19-
jsonpath: '{ .spec.ports[?(@.name=="minio-console")].port }'
20-
{{- end }}
26+
jsonpath: '{ .spec.ports[?(@.name=="minio-console")].port }'
2127

2228
{{- if (include "minio.createSecret" .) }}
2329
- name: ROOT_USER

‎addons/minio/2023/plans/standard-v4s256/bind.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ credential:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8+
{{- else if (eq .Values.service.type "ClusterIP") }}
9+
- name: HOST
10+
valueFrom:
11+
serviceRef:
12+
name: {{ include "common.names.fullname" . }}
13+
jsonpath: '{ .spec.clusterIP }'
14+
{{- end }}
815

916
- name: API_PORT
1017
valueFrom:
@@ -16,8 +23,7 @@ credential:
1623
valueFrom:
1724
serviceRef:
1825
name: {{ include "common.names.fullname" . }}
19-
jsonpath: '{ .spec.ports[?(@.name=="minio-console")].port }'
20-
{{- end }}
26+
jsonpath: '{ .spec.ports[?(@.name=="minio-console")].port }'
2127

2228
{{- if (include "minio.createSecret" .) }}
2329
- name: ROOT_USER

‎addons/minio/2023/plans/standard-v4s32/bind.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ credential:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8+
{{- else if (eq .Values.service.type "ClusterIP") }}
9+
- name: HOST
10+
valueFrom:
11+
serviceRef:
12+
name: {{ include "common.names.fullname" . }}
13+
jsonpath: '{ .spec.clusterIP }'
14+
{{- end }}
815

916
- name: API_PORT
1017
valueFrom:
@@ -16,8 +23,7 @@ credential:
1623
valueFrom:
1724
serviceRef:
1825
name: {{ include "common.names.fullname" . }}
19-
jsonpath: '{ .spec.ports[?(@.name=="minio-console")].port }'
20-
{{- end }}
26+
jsonpath: '{ .spec.ports[?(@.name=="minio-console")].port }'
2127

2228
{{- if (include "minio.createSecret" .) }}
2329
- name: ROOT_USER

‎addons/minio/2023/plans/standard-v4s512/bind.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ credential:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8+
{{- else if (eq .Values.service.type "ClusterIP") }}
9+
- name: HOST
10+
valueFrom:
11+
serviceRef:
12+
name: {{ include "common.names.fullname" . }}
13+
jsonpath: '{ .spec.clusterIP }'
14+
{{- end }}
815

916
- name: API_PORT
1017
valueFrom:
@@ -16,8 +23,7 @@ credential:
1623
valueFrom:
1724
serviceRef:
1825
name: {{ include "common.names.fullname" . }}
19-
jsonpath: '{ .spec.ports[?(@.name=="minio-console")].port }'
20-
{{- end }}
26+
jsonpath: '{ .spec.ports[?(@.name=="minio-console")].port }'
2127

2228
{{- if (include "minio.createSecret" .) }}
2329
- name: ROOT_USER

‎addons/minio/2023/plans/standard-v4s64/bind.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ credential:
55
serviceRef:
66
name: {{ include "common.names.fullname" . }}
77
jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
8+
{{- else if (eq .Values.service.type "ClusterIP") }}
9+
- name: HOST
10+
valueFrom:
11+
serviceRef:
12+
name: {{ include "common.names.fullname" . }}
13+
jsonpath: '{ .spec.clusterIP }'
14+
{{- end }}
815

916
- name: API_PORT
1017
valueFrom:
@@ -16,8 +23,7 @@ credential:
1623
valueFrom:
1724
serviceRef:
1825
name: {{ include "common.names.fullname" . }}
19-
jsonpath: '{ .spec.ports[?(@.name=="minio-console")].port }'
20-
{{- end }}
26+
jsonpath: '{ .spec.ports[?(@.name=="minio-console")].port }'
2127

2228
{{- if (include "minio.createSecret" .) }}
2329
- name: ROOT_USER

‎addons/opensearch/2.10/chart/opensearch/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ security:
305305
service:
306306
## @param service.type OpenSearch service type
307307
##
308-
type: LoadBalancer
308+
type: ClusterIP
309309
## @param service.ports.restAPI OpenSearch service REST API port
310310
## @param service.ports.transport OpenSearch service transport port
311311
##
@@ -2298,7 +2298,7 @@ dashboards:
22982298
service:
22992299
## @param dashboards.service.type OpenSearch Dashboards service type
23002300
##
2301-
type: LoadBalancer
2301+
type: ClusterIP
23022302
## @param dashboards.service.ports.http OpenSearch Dashboards service web UI port
23032303
##
23042304
ports:

‎addons/opensearch/2.10/meta.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ tags: opensearch
1313
bindable: true
1414
instances_retrievable: true
1515
bindings_retrievable: true
16-
plan_updateable: true
16+
plan_updateable: false
1717
allow_parameters:
1818
- name: "networkPolicy.allowNamespaces"
1919
description: "networkPolicy allowNamespaces config for values.yaml"
20+
- name: "service.type"
21+
description: "service type config for values.yaml"
22+
- name: "dashboards.service.type"
23+
description: "dashboards service type config for values.yaml"
2024
archive: false

0 commit comments

Comments
 (0)