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

Update common library chart to 3.4.0 to support rawResources #33

Open
wants to merge 1 commit into
base: main
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
2 changes: 1 addition & 1 deletion charts/homepage/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ maintainers:
dependencies:
- name: common
repository: https://bjw-s.github.io/helm-charts
version: 1.3.1
version: 3.4.0
annotations:
artifacthub.io/changes: |-
- kind: added
Expand Down
32 changes: 18 additions & 14 deletions charts/homepage/templates/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,27 @@ type: "custom"
volumeSpec:
configMap:
name: {{ (default (include "bjw-s.common.lib.chart.names.fullname" .) .Values.config.useExistingConfigMap) }}
subPath:
- path: bookmarks.yaml
mountPath: /app/config/bookmarks.yaml
- path: docker.yaml
mountPath: /app/config/docker.yaml
- path: kubernetes.yaml
mountPath: /app/config/kubernetes.yaml
- path: services.yaml
mountPath: /app/config/services.yaml
- path: settings.yaml
mountPath: /app/config/settings.yaml
- path: widgets.yaml
mountPath: /app/config/widgets.yaml
# Modified this to use advancedMounts, instead of subPath, because that's what the Common library expects for subPath mounts
advancedMounts:
main:
main:
- path: /config/bookmarks.yaml
subPath: bookmarks.yaml
- path: /config/docker.yaml
subPath: docker.yaml
- path: /config/kubernetes.yaml
subPath: kubernetes.yaml
- path: /config/services.yaml
subPath: services.yaml
- path: /config/settings.yaml
subPath: settings.yaml
- path: /config/widgets.yaml
subPath: widgets.yaml
{{- end -}}
{{- $_ := set .Values.persistence "homepage-config" (include "homepage.configVolume" . | fromYaml) -}}

{{- $_ := set .Values.controller.annotations "values-checksum" ( print .Values | sha256sum ) -}}
# Convert type from interface {} to map[string]interface {}
{{- $_ := set .Values.controllers.main "annotations" (dict "values-checksum" ( print .Values | sha256sum ) ) -}}

{{ if .Values.enableRbac }}
{{- $_ := set .Values.serviceAccount "create" "true" -}}
Expand Down
21 changes: 20 additions & 1 deletion charts/homepage/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ persistence:
logs:
enabled: true
type: emptyDir
mountPath: /app/config/logs
globalMounts:
- path: /app/config/logs

# resources:
# requests:
Expand All @@ -149,3 +150,21 @@ persistence:
# limits:
# memory: 200Mi
# cpu: 500m

# -- Configure any unsupported raw resources here.
rawResources: {}
# example:
# # -- Enables or disables the resource. Defaults to true
# enabled: true
# # -- Specify the apiVersion of the resource.
# apiVersion: v1
# # -- Specify the kind of the resource.
# kind: Endpoint
# # -- Override the name suffix that is used for this resource.
# nameOverride: ""
# # -- Provide additional annotations which may be required.
# annotations: {}
# # -- Provide additional labels which may be required.
# labels: {}
# # -- Configure the contents of the resource that is to be rendered.
# spec: