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

fix: respect some values in values.yaml #785

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
9 changes: 9 additions & 0 deletions helm/openwhisk/templates/elasticsearch-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ metadata:
annotations:
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
spec:
type: {{ .Values.elasticsearch.service.type }}
Copy link
Member

Choose a reason for hiding this comment

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

Should this be the ClusterIP if no type is specified?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, ClusterIP is default service type.

{{- if eq .Values.elasticsearch.service.type "NodePort" }}
nodePort: {{ .Values.elasticsearch.service.nodePort }}
{{- end }}
{{- if eq .Values.elasticsearch.service.type "LoadBalancer" }}
loadBalancerIP: {{ .Values.elasticsearch.service.loadBalancerIP }}
loadBalancerSourceRanges:
{{- toYaml .Values.elasticsearch.service.loadBalancerSourceRanges | indent 4 }}
{{- end }}
clusterIP: None # This is needed for statefulset hostnames like elasticsearch-0 to resolve
# Create endpoints also if the related pod isn't ready
publishNotReadyAddresses: true
Expand Down
1 change: 1 addition & 0 deletions helm/openwhisk/templates/grafana-pod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ spec:
containers:
- name: grafana
image: "{{- .Values.docker.registry.name -}}{{- .Values.grafana.imageName -}}:{{- .Values.grafana.imageTag -}}"
imagePullPolicy: {{ .Values.grafana.imagePullPolicy }}
env:
- name: "GF_AUTH_ANONYMOUS_ENABLED"
value: "true"
Expand Down