Skip to content
Merged
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
2 changes: 1 addition & 1 deletion charts/helix-controlplane/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.3.35
version: 0.3.36

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
19 changes: 19 additions & 0 deletions charts/helix-controlplane/templates/gke_managed_certificate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{{- if and .Values.ingress.enabled .Values.ingress.gke .Values.ingress.gke.managedCertificate .Values.ingress.gke.managedCertificate.enabled }}
apiVersion: networking.gke.io/v1
kind: ManagedCertificate
metadata:
name: {{ include "helix-controlplane.fullname" . }}-managed-cert
labels:
{{- include "helix-controlplane.labels" . | nindent 4 }}
spec:
domains:
{{- if .Values.ingress.gke.managedCertificate.domains }}
{{- range .Values.ingress.gke.managedCertificate.domains }}
- {{ . | quote }}
{{- end }}
{{- else }}
{{- range .Values.ingress.hosts }}
- {{ .host | quote }}
{{- end }}
{{- end }}
{{- end }}
7 changes: 7 additions & 0 deletions charts/helix-controlplane/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,13 @@ ingress:
- path: /
pathType: ImplementationSpecific
tls: []
# GKE-specific configuration
gke:
managedCertificate:
# Enable to automatically create a Google-managed TLS certificate
enabled: false
# Optional: specify domains explicitly. If empty, uses ingress.hosts[].host
domains: []

resources: {}

Expand Down
7 changes: 5 additions & 2 deletions scripts/index_repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@ chmod 700 get_helm.sh
./get_helm.sh

echo "Indexing repository"
if [ -f index.yaml ]; then
helm repo index --url "${REPO_URL}" --merge index.yaml ./temp
# The index.yaml is downloaded to temp/ by the previous gsutil rsync step
if [ -f temp/index.yaml ]; then
echo "Merging with existing index.yaml"
helm repo index --url "${REPO_URL}" --merge temp/index.yaml ./temp
else
echo "Creating new index.yaml"
helm repo index --url "${REPO_URL}" ./temp
fi
Loading