diff --git a/charts/chia/1.3.21/Chart.yaml b/charts/chia/1.3.21/Chart.yaml index 724cedd3a2..b9bf92c840 100644 --- a/charts/chia/1.3.21/Chart.yaml +++ b/charts/chia/1.3.21/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v1.2.11 dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: Global, Versioned, peer-to-peer filesystem. home: https://www.chia.net/ icon: https://www.chia.net/img/chia_logo.svg diff --git a/charts/chia/1.3.21/charts/common-2105.0.0.tgz b/charts/chia/1.3.21/charts/common-2105.0.0.tgz deleted file mode 100644 index ef6f820efb..0000000000 Binary files a/charts/chia/1.3.21/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/charts/chia/1.3.21/charts/common-2112.0.0.tgz b/charts/chia/1.3.21/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62591a2a38 Binary files /dev/null and b/charts/chia/1.3.21/charts/common-2112.0.0.tgz differ diff --git a/charts/chia/1.3.21/requirements.lock b/charts/chia/1.3.21/requirements.lock index eba13d88bf..a44e8748a1 100644 --- a/charts/chia/1.3.21/requirements.lock +++ b/charts/chia/1.3.21/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-17T18:26:46.201544+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:40:37.147936+05:00" diff --git a/charts/collabora/1.0.0/Chart.yaml b/charts/collabora/1.0.0/Chart.yaml index f6fa2c3265..cde9ab11e8 100644 --- a/charts/collabora/1.0.0/Chart.yaml +++ b/charts/collabora/1.0.0/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: 6.4.10.10 dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: "Collabora Online Development Edition \u2013 an awesome, Online Office \ suite image suitable for home use." home: https://github.com/CollaboraOnline/online icon: https://avatars.githubusercontent.com/u/22418908?s=200&v=4 diff --git a/charts/collabora/1.0.0/charts/common-2105.0.0.tgz b/charts/collabora/1.0.0/charts/common-2105.0.0.tgz deleted file mode 100644 index ef6f820efb..0000000000 Binary files a/charts/collabora/1.0.0/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/charts/collabora/1.0.0/charts/common-2112.0.0.tgz b/charts/collabora/1.0.0/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62591a2a38 Binary files /dev/null and b/charts/collabora/1.0.0/charts/common-2112.0.0.tgz differ diff --git a/charts/collabora/1.0.0/requirements.lock b/charts/collabora/1.0.0/requirements.lock index eba13d88bf..63eaf5e67a 100644 --- a/charts/collabora/1.0.0/requirements.lock +++ b/charts/collabora/1.0.0/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-17T18:26:46.201544+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:40:37.099966+05:00" diff --git a/charts/ipfs/1.1.3/Chart.yaml b/charts/ipfs/1.1.3/Chart.yaml index c7b79a8556..5cb3f22f8f 100644 --- a/charts/ipfs/1.1.3/Chart.yaml +++ b/charts/ipfs/1.1.3/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v0.10.0 dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: Global, Versioned, peer-to-peer filesystem. home: https://ipfs.io icon: https://ipfs.io/ipfs/QmVk7srrwahXLNmcDYvyUEJptyoxpndnRa57YJ11L4jV26/ipfs.go.png diff --git a/charts/ipfs/1.1.3/charts/common-2105.0.0.tgz b/charts/ipfs/1.1.3/charts/common-2105.0.0.tgz deleted file mode 100644 index 6a406ffcec..0000000000 Binary files a/charts/ipfs/1.1.3/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/charts/ipfs/1.1.3/charts/common-2112.0.0.tgz b/charts/ipfs/1.1.3/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62591a2a38 Binary files /dev/null and b/charts/ipfs/1.1.3/charts/common-2112.0.0.tgz differ diff --git a/charts/ipfs/1.1.3/requirements.lock b/charts/ipfs/1.1.3/requirements.lock index 9af05d743a..a6072ed61e 100644 --- a/charts/ipfs/1.1.3/requirements.lock +++ b/charts/ipfs/1.1.3/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-10T13:07:35.352903+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:40:36.992369+05:00" diff --git a/charts/ix-chart/2111.0.1/Chart.lock b/charts/ix-chart/2111.0.1/Chart.lock index be2b86fc9b..ba76e05c13 100644 --- a/charts/ix-chart/2111.0.1/Chart.lock +++ b/charts/ix-chart/2111.0.1/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-10T13:07:35.387798+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:40:37.023887+05:00" diff --git a/charts/ix-chart/2111.0.1/Chart.yaml b/charts/ix-chart/2111.0.1/Chart.yaml index e36a2c223b..7e7a3968df 100644 --- a/charts/ix-chart/2111.0.1/Chart.yaml +++ b/charts/ix-chart/2111.0.1/Chart.yaml @@ -23,6 +23,6 @@ version: 2111.0.1 appVersion: v1 dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 diff --git a/charts/ix-chart/2111.0.1/charts/common-2105.0.0.tgz b/charts/ix-chart/2111.0.1/charts/common-2105.0.0.tgz deleted file mode 100644 index 201c3caeeb..0000000000 Binary files a/charts/ix-chart/2111.0.1/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/charts/ix-chart/2111.0.1/charts/common-2112.0.0.tgz b/charts/ix-chart/2111.0.1/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62591a2a38 Binary files /dev/null and b/charts/ix-chart/2111.0.1/charts/common-2112.0.0.tgz differ diff --git a/charts/machinaris/1.0.11/Chart.yaml b/charts/machinaris/1.0.11/Chart.yaml index 60ba06d412..2dd13f5a7f 100644 --- a/charts/machinaris/1.0.11/Chart.yaml +++ b/charts/machinaris/1.0.11/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v0.6.1 dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: Global, Versioned, peer-to-peer filesystem. home: https://github.com/guydavis/machinaris icon: https://raw.githubusercontent.com/guydavis/machinaris/main/web/static/favicon.ico diff --git a/charts/machinaris/1.0.11/charts/common-2105.0.0.tgz b/charts/machinaris/1.0.11/charts/common-2105.0.0.tgz deleted file mode 100644 index ef6f820efb..0000000000 Binary files a/charts/machinaris/1.0.11/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/charts/machinaris/1.0.11/charts/common-2112.0.0.tgz b/charts/machinaris/1.0.11/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62591a2a38 Binary files /dev/null and b/charts/machinaris/1.0.11/charts/common-2112.0.0.tgz differ diff --git a/charts/machinaris/1.0.11/requirements.lock b/charts/machinaris/1.0.11/requirements.lock index eba13d88bf..36c2778f94 100644 --- a/charts/machinaris/1.0.11/requirements.lock +++ b/charts/machinaris/1.0.11/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-17T18:26:46.201544+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:40:37.075818+05:00" diff --git a/charts/minio/1.4.7/Chart.yaml b/charts/minio/1.4.7/Chart.yaml index 76335b3eb2..b8a026b06d 100644 --- a/charts/minio/1.4.7/Chart.yaml +++ b/charts/minio/1.4.7/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: '2021-11-24' dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: High Performance, Kubernetes Native Object Storage home: https://min.io icon: https://min.io/resources/img/logo/MINIO_wordmark.png diff --git a/charts/minio/1.4.7/charts/common-2105.0.0.tgz b/charts/minio/1.4.7/charts/common-2105.0.0.tgz deleted file mode 100644 index 6a406ffcec..0000000000 Binary files a/charts/minio/1.4.7/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/charts/minio/1.4.7/charts/common-2112.0.0.tgz b/charts/minio/1.4.7/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62591a2a38 Binary files /dev/null and b/charts/minio/1.4.7/charts/common-2112.0.0.tgz differ diff --git a/charts/minio/1.4.7/requirements.lock b/charts/minio/1.4.7/requirements.lock index 28e1370a83..54be97f069 100644 --- a/charts/minio/1.4.7/requirements.lock +++ b/charts/minio/1.4.7/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-10T13:07:35.423192+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:40:37.050749+05:00" diff --git a/charts/nextcloud/1.3.11/Chart.lock b/charts/nextcloud/1.3.11/Chart.lock index 9395bdf3f9..9e88d8d76b 100644 --- a/charts/nextcloud/1.3.11/Chart.lock +++ b/charts/nextcloud/1.3.11/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-10T13:07:35.317071+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:40:36.963767+05:00" diff --git a/charts/nextcloud/1.3.11/Chart.yaml b/charts/nextcloud/1.3.11/Chart.yaml index 727f1ebbbf..a24a2b8cf2 100644 --- a/charts/nextcloud/1.3.11/Chart.yaml +++ b/charts/nextcloud/1.3.11/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: '23' dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: A file sharing server that puts the control and security of your own data back into your hands. home: https://nextcloud.com/ diff --git a/charts/nextcloud/1.3.11/charts/common-2105.0.0.tgz b/charts/nextcloud/1.3.11/charts/common-2105.0.0.tgz deleted file mode 100644 index 6a406ffcec..0000000000 Binary files a/charts/nextcloud/1.3.11/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/charts/nextcloud/1.3.11/charts/common-2112.0.0.tgz b/charts/nextcloud/1.3.11/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62591a2a38 Binary files /dev/null and b/charts/nextcloud/1.3.11/charts/common-2112.0.0.tgz differ diff --git a/charts/plex/1.6.13/Chart.lock b/charts/plex/1.6.13/Chart.lock index e0a3597a26..83a4b8334f 100644 --- a/charts/plex/1.6.13/Chart.lock +++ b/charts/plex/1.6.13/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-10T13:07:35.458234+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:40:37.124184+05:00" diff --git a/charts/plex/1.6.13/Chart.yaml b/charts/plex/1.6.13/Chart.yaml index 45c00b0a2c..2eecca4727 100644 --- a/charts/plex/1.6.13/Chart.yaml +++ b/charts/plex/1.6.13/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: 1.25.0.5282 dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: Plex Media Server home: https://plex.tv/ icon: https://www.plex.tv/wp-content/uploads/2018/01/pmp-icon-1.png diff --git a/charts/plex/1.6.13/charts/common-2105.0.0.tgz b/charts/plex/1.6.13/charts/common-2105.0.0.tgz deleted file mode 100644 index 6a406ffcec..0000000000 Binary files a/charts/plex/1.6.13/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/charts/plex/1.6.13/charts/common-2112.0.0.tgz b/charts/plex/1.6.13/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62591a2a38 Binary files /dev/null and b/charts/plex/1.6.13/charts/common-2112.0.0.tgz differ diff --git a/library/common/2112.0.0/.helmignore b/library/common/2112.0.0/.helmignore new file mode 100644 index 0000000000..0e8a0eb36f --- /dev/null +++ b/library/common/2112.0.0/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/library/common/2112.0.0/Chart.yaml b/library/common/2112.0.0/Chart.yaml new file mode 100644 index 0000000000..a8dc7d1472 --- /dev/null +++ b/library/common/2112.0.0/Chart.yaml @@ -0,0 +1,23 @@ +apiVersion: v2 +name: common +description: A library chart for iX Official Catalog + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: library + +# 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: 2112.0.0 + +# 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 +# follow Semantic Versioning. They should reflect the version the application is using. +appVersion: v1 diff --git a/library/common/2112.0.0/README.md b/library/common/2112.0.0/README.md new file mode 100644 index 0000000000..f8784843a2 --- /dev/null +++ b/library/common/2112.0.0/README.md @@ -0,0 +1,11 @@ +# Library Chart for iX Official Catalog iX Chart + +**WARNING: THIS CHART IS NOT MEANT TO BE INSTALLED DIRECTLY** + +This is a [Helm Library Chart](https://helm.sh/docs/topics/library_charts/#helm). It's purpose is for grouping common logic between the k8s@home charts. + +Since a lot of charts follow the same pattern this library was built to reduce maintenance cost between the charts that use it and try achieve a goal of being DRY. + +## Introduction + +This chart provides common template helpers which can be used to develop new charts using [Helm](https://helm.sh) package manager. diff --git a/library/common/2112.0.0/templates/_serviceaccount.tpl b/library/common/2112.0.0/templates/_serviceaccount.tpl new file mode 100644 index 0000000000..b96d4009a9 --- /dev/null +++ b/library/common/2112.0.0/templates/_serviceaccount.tpl @@ -0,0 +1,11 @@ +{{/* +Common service account +*/}} +{{- define "common.serviceaccount" -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "common.names.serviceAccountName" . | quote }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.selectorLabels" . | nindent 4 -}} +{{- end -}} diff --git a/library/common/2112.0.0/templates/classes/_service.tpl b/library/common/2112.0.0/templates/classes/_service.tpl new file mode 100644 index 0000000000..c63ab9b933 --- /dev/null +++ b/library/common/2112.0.0/templates/classes/_service.tpl @@ -0,0 +1,41 @@ +{{/* +This template serves as a blueprint for all Service objects that are created +within the common library. +*/}} +{{- define "common.classes.service" -}} +{{- $values := .commonService -}} +{{- $serviceName := include "common.names.fullname" . -}} +{{- if hasKey $values "nameSuffix" -}} + {{- $serviceName = (printf "%v-%v" $serviceName $values.nameSuffix) -}} +{{ end -}} +{{- $svcType := $values.type | default "" -}} +apiVersion: v1 +kind: Service +metadata: + name: {{ $serviceName }} + labels: + {{- include "common.labels" . | nindent 4 }} + {{- if $values.labels }} + {{ toYaml $values.labels | nindent 4 }} + {{- end }} + {{- if $values.annotations }} + {{- with $values.annotations }} + annotations: + {{ toYaml . | nindent 4 }} + {{- end }} + {{- end }} +spec: + {{- if (or (eq $svcType "ClusterIP") (empty $svcType)) }} + type: ClusterIP + {{- if $values.clusterIP }} + clusterIP: {{ $values.clusterIP }} + {{end}} + {{- else if eq $svcType "NodePort" }} + type: {{ $svcType }} + {{- else }} + {{- fail "Only ClusterIP and NodePort services are supported in common chart" }} + {{- end }} + {{- include "common.classes.service.ports" (dict "svcType" $svcType "values" $values ) | trim | nindent 2 }} + selector: + {{- include "common.labels.selectorLabels" . | nindent 4 }} +{{- end }} diff --git a/library/common/2112.0.0/templates/classes/_service_ports.tpl b/library/common/2112.0.0/templates/classes/_service_ports.tpl new file mode 100644 index 0000000000..a61900b42a --- /dev/null +++ b/library/common/2112.0.0/templates/classes/_service_ports.tpl @@ -0,0 +1,19 @@ +{{/* +Render all the ports and additionalPorts for a Service object. +*/}} +{{- define "common.classes.service.ports" -}} + {{- $values := .values -}} + {{- $ports := $values.ports -}} + {{- if $ports -}} + ports: + {{- range $_ := $ports }} + - port: {{ .port }} + targetPort: {{ .targetPort | default "http" }} + protocol: {{ .protocol | default "TCP" }} + name: {{ .name | default "http" }} + {{- if (and (eq $.svcType "NodePort") (not (empty .nodePort))) }} + nodePort: {{ .nodePort }} + {{ end }} + {{- end -}} + {{- end -}} +{{- end }} diff --git a/library/common/2112.0.0/templates/lib/chart/_annotations.tpl b/library/common/2112.0.0/templates/lib/chart/_annotations.tpl new file mode 100644 index 0000000000..ad80be1e90 --- /dev/null +++ b/library/common/2112.0.0/templates/lib/chart/_annotations.tpl @@ -0,0 +1,6 @@ +{{/* +Common workload annotations +*/}} +{{- define "common.annotations" -}} +rollme: {{ randAlphaNum 5 | quote }} +{{- end -}} diff --git a/library/common/2112.0.0/templates/lib/chart/_capabilities.tpl b/library/common/2112.0.0/templates/lib/chart/_capabilities.tpl new file mode 100644 index 0000000000..7a3c13c8b2 --- /dev/null +++ b/library/common/2112.0.0/templates/lib/chart/_capabilities.tpl @@ -0,0 +1,27 @@ +{{/* +Return the appropriate apiVersion for DaemonSet objects. +*/}} +{{- define "common.capabilities.daemonset.apiVersion" -}} +{{- print "apps/v1" -}} +{{- end -}} + +{{/* +Return the appropriate apiVersion for Deployment objects. +*/}} +{{- define "common.capabilities.deployment.apiVersion" -}} +{{- print "apps/v1" -}} +{{- end -}} + +{{/* +Return the appropriate apiVersion for StatefulSet objects. +*/}} +{{- define "common.capabilities.statefulset.apiVersion" -}} +{{- print "apps/v1" -}} +{{- end -}} + +{{/* +Return the appropriate apiVersion for StatefulSet objects. +*/}} +{{- define "common.capabilities.cronjob.apiVersion" -}} +{{- print "batch/v1beta1" -}} +{{- end -}} diff --git a/library/common/2112.0.0/templates/lib/chart/_labels.tpl b/library/common/2112.0.0/templates/lib/chart/_labels.tpl new file mode 100644 index 0000000000..f64aead636 --- /dev/null +++ b/library/common/2112.0.0/templates/lib/chart/_labels.tpl @@ -0,0 +1,24 @@ +{{/* +Common labels shared across objects. +*/}} +{{- define "common.labels" -}} +helm.sh/chart: {{ include "common.names.chart" . }} +{{ include "common.labels.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels shared across objects. +*/}} +{{- define "common.labels.selectorLabels" -}} +app.kubernetes.io/name: {{ include "common.names.name" . }} +app.kubernetes.io/instance: {{ include "common.names.releaseName" . }} +{{ if hasKey .Values "extraSelectorLabels" }} +{{ range $selector := .Values.extraSelectorLabels }} +{{ printf "%s: %s" $selector.key $selector.value }} +{{ end }} +{{ end }} +{{- end }} diff --git a/library/common/2112.0.0/templates/lib/chart/_names.tpl b/library/common/2112.0.0/templates/lib/chart/_names.tpl new file mode 100644 index 0000000000..e98c6b4e6f --- /dev/null +++ b/library/common/2112.0.0/templates/lib/chart/_names.tpl @@ -0,0 +1,66 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "common.names.name" -}} +{{- $values := (.common | default dict) -}} +{{- $name := (default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-") }} +{{- if hasKey $values "nameSuffix" -}} + {{- $name = (printf "%v-%v" $name $values.nameSuffix) -}} +{{ end -}} +{{- print $name -}} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "common.names.fullname" -}} +{{- $values := (.common | default dict) -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- $name = (.Release.Name | trunc 63 | trimSuffix "-") }} +{{- else }} +{{- $name = (printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-") }} +{{- end }} +{{- if hasKey $values "nameSuffix" -}} + {{- $name = (printf "%v-%v" $name $values.nameSuffix) -}} +{{ end -}} +{{- print $name -}} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "common.names.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Determine service account name for deployment or statefulset. +*/}} +{{- define "common.names.serviceAccountName" -}} +{{- if .Values.serviceAccountNameOverride }} +{{- .Values.serviceAccountNameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-service-account" (include "common.names.releaseName" .) | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} + + +{{/* +Determine release name +This will add a suffix to the release name if nameSuffix is set +*/}} +{{- define "common.names.releaseName" -}} +{{- $values := (.common | default dict) -}} +{{- if hasKey $values "nameSuffix" -}} + {{- printf "%v-%v" .Release.Name $values.nameSuffix -}} +{{- else -}} + {{- print .Release.Name -}} +{{ end -}} +{{- end -}} diff --git a/library/common/2112.0.0/templates/lib/containers/_environment.tpl b/library/common/2112.0.0/templates/lib/containers/_environment.tpl new file mode 100644 index 0000000000..d757f459c1 --- /dev/null +++ b/library/common/2112.0.0/templates/lib/containers/_environment.tpl @@ -0,0 +1,41 @@ +{{/* +Render environment variable +*/}} +{{- define "common.containers.environmentVariable" -}} +{{- $envVariable := . -}} +{{- include "common.schema.validateKeys" (dict "values" $envVariable "checkKeys" (list "name")) -}} +{{- if $envVariable.valueFromSecret -}} +{{- include "common.schema.validateKeys" (dict "values" $envVariable "checkKeys" (list "secretName" "secretKey")) -}} +- name: {{ $envVariable.name | quote }} + valueFrom: + secretKeyRef: + name: {{ $envVariable.secretName | quote }} + key: {{ $envVariable.secretKey | quote }} +{{- else -}} +{{- include "common.schema.validateKeys" (dict "values" $envVariable "checkKeys" (list "value")) -}} +- name: {{ $envVariable.name | quote }} + value: {{ $envVariable.value | quote }} +{{- end -}} +{{- end -}} + +{{/* +Render environment variables +*/}} +{{- define "common.containers.environmentVariables" -}} +{{- $values := . -}} +{{- include "common.schema.validateKeys" (dict "values" $values "checkKeys" (list "environmentVariables")) -}} +{{- range $envVariable := $values.environmentVariables -}} +{{- include "common.containers.environmentVariable" $envVariable | nindent 0 -}} +{{- end -}} +{{- end -}} + +{{/* +Render environment variables if present +*/}} +{{- define "common.containers.allEnvironmentVariables" -}} +{{- $values := . -}} +{{- include "common.schema.validateKeys" (dict "values" $values "checkKeys" (list "environmentVariables")) -}} +{{- if $values.environmentVariables -}} +env: {{- include "common.containers.environmentVariables" $values | nindent 2 -}} +{{- end -}} +{{- end -}} diff --git a/library/common/2112.0.0/templates/lib/containers/_image.tpl b/library/common/2112.0.0/templates/lib/containers/_image.tpl new file mode 100644 index 0000000000..2b2b04561d --- /dev/null +++ b/library/common/2112.0.0/templates/lib/containers/_image.tpl @@ -0,0 +1,9 @@ +{{/* +Retrieve image configuration for container +*/}} +{{- define "common.containers.imageConfig" -}} +{{- $values := . -}} +{{- include "common.schema.validateKeys" (dict "values" $values "checkKeys" (list "repository" "tag" "pullPolicy")) -}} +image: "{{ $values.repository }}{{- if hasKey $values "postfix" -}}-{{ $values.postfix }}{{- end -}}:{{ $values.tag }}" +imagePullPolicy: {{ $values.pullPolicy }} +{{- end -}} diff --git a/library/common/2112.0.0/templates/lib/containers/_port.tpl b/library/common/2112.0.0/templates/lib/containers/_port.tpl new file mode 100644 index 0000000000..d7226c9bd6 --- /dev/null +++ b/library/common/2112.0.0/templates/lib/containers/_port.tpl @@ -0,0 +1,15 @@ +{{/* +Retrieve ports configuration for container +*/}} +{{- define "common.containers.configurePorts" -}} +{{- if .ports -}} +ports: +{{- range $index, $port := .ports -}} +{{- include "common.schema.validateKeys" (dict "values" $port "checkKeys" (list "protocol" "containerPort")) }} +- protocol: {{ $port.protocol }} + containerPort: {{ $port.containerPort }} + {{ if hasKey $port "hostPort" }}hostPort: {{ $port.hostPort }}{{ end }} + {{ if hasKey $port "name" }}name: {{ $port.name }}{{ end }} +{{- end -}} +{{- end -}} +{{- end -}} diff --git a/library/common/2112.0.0/templates/lib/containers/_resource.tpl b/library/common/2112.0.0/templates/lib/containers/_resource.tpl new file mode 100644 index 0000000000..fd4f6eef02 --- /dev/null +++ b/library/common/2112.0.0/templates/lib/containers/_resource.tpl @@ -0,0 +1,10 @@ +{{/* +Retrieve GPU Configuration +*/}} +{{- define "common.containers.gpuConfiguration" -}} +{{- $values := . -}} +{{ if $values.gpuConfiguration }} +resources: + limits: {{- toYaml $values.gpuConfiguration | nindent 4 }} +{{ end }} +{{- end -}} diff --git a/library/common/2112.0.0/templates/lib/deployments/_utils.tpl b/library/common/2112.0.0/templates/lib/deployments/_utils.tpl new file mode 100644 index 0000000000..b8b2f76ad5 --- /dev/null +++ b/library/common/2112.0.0/templates/lib/deployments/_utils.tpl @@ -0,0 +1,41 @@ +{{/* +Retrieve deployment metadata +*/}} +{{- define "common.deployment.metadata" -}} +metadata: + name: {{ template "common.names.fullname" . }} + labels: {{ include "common.labels.selectorLabels" . | nindent 4 }} +{{- end -}} + + +{{/* +Retrieve replicas/strategy/selector +*/}} +{{- define "common.deployment.common_spec" -}} +replicas: {{ (default 1 .Values.replicas) }} +strategy: + type: {{ (default "Recreate" .Values.updateStrategy ) }} +selector: + matchLabels: {{ include "common.labels.selectorLabels" . | nindent 4 }} +{{- end -}} + + +{{/* +Retrieve deployment pod's metadata +*/}} +{{- define "common.deployment.pod.metadata" -}} +metadata: + name: {{ template "common.names.fullname" . }} + labels: {{ include "common.labels.selectorLabels" . | nindent 4 }} + annotations: {{ include "common.annotations" . | nindent 4 }} +{{- end -}} + + +{{/* +Retrieve common deployment configuration +*/}} +{{- define "common.deployment.common_config" -}} +apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }} +kind: Deployment +{{ include "common.deployment.metadata" . | nindent 0 }} +{{- end -}} diff --git a/library/common/2112.0.0/templates/lib/networking/_dns.tpl b/library/common/2112.0.0/templates/lib/networking/_dns.tpl new file mode 100644 index 0000000000..3a748a4aae --- /dev/null +++ b/library/common/2112.0.0/templates/lib/networking/_dns.tpl @@ -0,0 +1,12 @@ +{{/* +DNS Configuration +*/}} +{{- define "common.networking.dnsConfiguration" }} +{{ if .dnsPolicy }} +dnsPolicy: {{ .dnsPolicy }} +{{ end }} +{{ if .dnsConfig }} +dnsConfig: + {{ toYaml .dnsConfig | nindent 2 }} +{{ end }} +{{- end }} diff --git a/library/common/2112.0.0/templates/lib/resources/_certs.tpl b/library/common/2112.0.0/templates/lib/resources/_certs.tpl new file mode 100644 index 0000000000..9e091595e9 --- /dev/null +++ b/library/common/2112.0.0/templates/lib/resources/_certs.tpl @@ -0,0 +1,26 @@ +{{/* +Retrieve true/false if certificate is available in ixCertificates +*/}} +{{- define "common.resources.cert_present" -}} +{{- $values := . -}} +{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "commonCertOptions")) -}} +{{- hasKey $values.Values.ixCertificates ($values.commonCertOptions.certKeyName | toString) -}} +{{- end -}} + + +{{/* +Retrieve certificate from variable name +*/}} +{{- define "common.resources.cert" -}} +{{- $values := . -}} +{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "commonCertOptions")) -}} +{{- $certKey := ($values.commonCertOptions.certKeyName | toString) -}} +{{- if hasKey $values.Values.ixCertificates $certKey -}} +{{- $cert := get $values.Values.ixCertificates $certKey -}} +{{- if $values.commonCertOptions.publicKey -}} +{{ $cert.certificate }} +{{- else -}} +{{ $cert.privatekey }} +{{- end -}} +{{- end -}} +{{- end -}} diff --git a/library/common/2112.0.0/templates/lib/schema/_utils.tpl b/library/common/2112.0.0/templates/lib/schema/_utils.tpl new file mode 100644 index 0000000000..8577a0b615 --- /dev/null +++ b/library/common/2112.0.0/templates/lib/schema/_utils.tpl @@ -0,0 +1,19 @@ +{{/* +Checks if a list of keys are present in a dictionary +*/}} +{{- define "common.schema.validateKeys" -}} +{{- $values := . -}} +{{- if and (hasKey $values "values") (hasKey $values "checkKeys") -}} +{{- $missingKeys := list -}} +{{- range $values.checkKeys -}} +{{- if eq (hasKey $values.values . ) false -}} +{{- $missingKeys = mustAppend $missingKeys . -}} +{{- end -}} +{{- end -}} +{{- if $missingKeys -}} +{{- fail (printf "Missing %s from dictionary" ($missingKeys | join ", ")) -}} +{{- end -}} +{{- else -}} +{{- fail "A dictionary and list of keys to check must be provided" -}} +{{- end -}} +{{- end -}} diff --git a/library/common/2112.0.0/templates/lib/storage/_appStorage.tpl b/library/common/2112.0.0/templates/lib/storage/_appStorage.tpl new file mode 100644 index 0000000000..b97a8b2c09 --- /dev/null +++ b/library/common/2112.0.0/templates/lib/storage/_appStorage.tpl @@ -0,0 +1,75 @@ +{{/* +Define appVolumeMounts for container +*/}} +{{- define "common.storage.configureAppVolumeMountsInContainer" -}} +{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "appVolumeMounts")) -}} +{{- $appVolumeMounts := .appVolumeMounts -}} +{{- if $appVolumeMounts -}} +{{ range $name, $avm := $appVolumeMounts }} +{{- if (default true $avm.enabled) -}} +{{ if $avm.containerNameOverride }} +{{ $name = $avm.containerNameOverride }} +{{ end }} +- name: {{ $name }} + mountPath: {{ $avm.mountPath }} + {{ if $avm.subPath }} + subPath: {{ $avm.subPath }} + {{ end }} + {{ if $avm.readOnly }} + readOnly: {{ $avm.readOnly }} + {{ end }} +{{- end -}} +{{ end }} +{{- end -}} +{{- end -}} + + +{{/* +Define hostPath for appVolumes +*/}} +{{- define "common.storage.configureAppVolumes" -}} +{{- include "common.schema.validateKeys" (dict "values" . "checkKeys" (list "appVolumeMounts")) -}} +{{- $values := . -}} +{{- if $values.appVolumeMounts -}} +{{- range $name, $av := $values.appVolumeMounts -}} +{{ if (default true $av.enabled) }} +- name: {{ $name }} + {{ if or $av.emptyDir $.emptyDirVolumes }} + emptyDir: {} + {{- else -}} + hostPath: + {{ if $av.hostPathEnabled }} + path: {{ required "hostPath not set" $av.hostPath }} + {{ else }} + {{- include "common.schema.validateKeys" (dict "values" $values "checkKeys" (list "ixVolumes")) -}} + {{- include "common.schema.validateKeys" (dict "values" $av "checkKeys" (list "datasetName")) -}} + {{- $volDict := dict "datasetName" $av.datasetName "ixVolumes" $values.ixVolumes -}} + path: {{ include "common.storage.retrieveHostPathFromiXVolume" $volDict }} + {{ end }} + {{ end }} +{{ end }} +{{- end -}} +{{- end -}} +{{- end -}} + + +{{/* +Get all volumes configuration +*/}} +{{- define "common.storage.allAppVolumes" -}} +{{- $appVolumeMounts := .appVolumeMounts -}} +{{- if $appVolumeMounts -}} +volumes: {{- include "common.storage.configureAppVolumes" . | nindent 2 -}} +{{- end -}} +{{- end -}} + + +{{/* +Get all container volume moutns configuration +*/}} +{{- define "common.storage.allContainerVolumeMounts" -}} +{{- $appVolumeMounts := .appVolumeMounts -}} +{{- if $appVolumeMounts -}} +volumeMounts: {{- include "common.storage.configureAppVolumeMountsInContainer" . | nindent 2 -}} +{{- end -}} +{{- end -}} diff --git a/library/common/2112.0.0/templates/lib/storage/_ixvolumes.tpl b/library/common/2112.0.0/templates/lib/storage/_ixvolumes.tpl new file mode 100644 index 0000000000..f45b9d8d96 --- /dev/null +++ b/library/common/2112.0.0/templates/lib/storage/_ixvolumes.tpl @@ -0,0 +1,11 @@ +{{/* +Retrieve host path from ix volumes based on dataset name +*/}} +{{- define "common.storage.retrieveHostPathFromiXVolume" -}} +{{- range $index, $hostPathConfiguration := $.ixVolumes }} +{{- $dsName := base $hostPathConfiguration.hostPath -}} +{{- if eq $.datasetName $dsName -}} +{{- $hostPathConfiguration.hostPath -}} +{{- end -}} +{{- end }} +{{- end -}} diff --git a/test/chia/1.3.21/Chart.yaml b/test/chia/1.3.21/Chart.yaml index 724cedd3a2..b9bf92c840 100644 --- a/test/chia/1.3.21/Chart.yaml +++ b/test/chia/1.3.21/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v1.2.11 dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: Global, Versioned, peer-to-peer filesystem. home: https://www.chia.net/ icon: https://www.chia.net/img/chia_logo.svg diff --git a/test/chia/1.3.21/charts/common-2105.0.0.tgz b/test/chia/1.3.21/charts/common-2105.0.0.tgz deleted file mode 100644 index ef6f820efb..0000000000 Binary files a/test/chia/1.3.21/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/test/chia/1.3.21/charts/common-2112.0.0.tgz b/test/chia/1.3.21/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62c214e1c8 Binary files /dev/null and b/test/chia/1.3.21/charts/common-2112.0.0.tgz differ diff --git a/test/chia/1.3.21/requirements.lock b/test/chia/1.3.21/requirements.lock index eba13d88bf..f8debca24d 100644 --- a/test/chia/1.3.21/requirements.lock +++ b/test/chia/1.3.21/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-17T18:26:46.201544+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:24:36.722808+05:00" diff --git a/test/collabora/1.0.0/Chart.yaml b/test/collabora/1.0.0/Chart.yaml index f6fa2c3265..cde9ab11e8 100644 --- a/test/collabora/1.0.0/Chart.yaml +++ b/test/collabora/1.0.0/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: 6.4.10.10 dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: "Collabora Online Development Edition \u2013 an awesome, Online Office \ suite image suitable for home use." home: https://github.com/CollaboraOnline/online icon: https://avatars.githubusercontent.com/u/22418908?s=200&v=4 diff --git a/test/collabora/1.0.0/charts/common-2105.0.0.tgz b/test/collabora/1.0.0/charts/common-2105.0.0.tgz deleted file mode 100644 index ef6f820efb..0000000000 Binary files a/test/collabora/1.0.0/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/test/collabora/1.0.0/charts/common-2112.0.0.tgz b/test/collabora/1.0.0/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62c214e1c8 Binary files /dev/null and b/test/collabora/1.0.0/charts/common-2112.0.0.tgz differ diff --git a/test/collabora/1.0.0/requirements.lock b/test/collabora/1.0.0/requirements.lock index eba13d88bf..137d873a09 100644 --- a/test/collabora/1.0.0/requirements.lock +++ b/test/collabora/1.0.0/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-17T18:26:46.201544+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:24:36.674776+05:00" diff --git a/test/ipfs/1.1.3/Chart.yaml b/test/ipfs/1.1.3/Chart.yaml index c7b79a8556..5cb3f22f8f 100644 --- a/test/ipfs/1.1.3/Chart.yaml +++ b/test/ipfs/1.1.3/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v0.10.0 dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: Global, Versioned, peer-to-peer filesystem. home: https://ipfs.io icon: https://ipfs.io/ipfs/QmVk7srrwahXLNmcDYvyUEJptyoxpndnRa57YJ11L4jV26/ipfs.go.png diff --git a/test/ipfs/1.1.3/charts/common-2105.0.0.tgz b/test/ipfs/1.1.3/charts/common-2105.0.0.tgz deleted file mode 100644 index 6a406ffcec..0000000000 Binary files a/test/ipfs/1.1.3/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/test/ipfs/1.1.3/charts/common-2112.0.0.tgz b/test/ipfs/1.1.3/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62c214e1c8 Binary files /dev/null and b/test/ipfs/1.1.3/charts/common-2112.0.0.tgz differ diff --git a/test/ipfs/1.1.3/requirements.lock b/test/ipfs/1.1.3/requirements.lock index 9af05d743a..70c48680b4 100644 --- a/test/ipfs/1.1.3/requirements.lock +++ b/test/ipfs/1.1.3/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-10T13:07:35.352903+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:24:36.550755+05:00" diff --git a/test/ix-chart/2111.0.1/Chart.lock b/test/ix-chart/2111.0.1/Chart.lock index be2b86fc9b..216fc20eb1 100644 --- a/test/ix-chart/2111.0.1/Chart.lock +++ b/test/ix-chart/2111.0.1/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-10T13:07:35.387798+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:24:36.595653+05:00" diff --git a/test/ix-chart/2111.0.1/Chart.yaml b/test/ix-chart/2111.0.1/Chart.yaml index e36a2c223b..7e7a3968df 100644 --- a/test/ix-chart/2111.0.1/Chart.yaml +++ b/test/ix-chart/2111.0.1/Chart.yaml @@ -23,6 +23,6 @@ version: 2111.0.1 appVersion: v1 dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 diff --git a/test/ix-chart/2111.0.1/charts/common-2105.0.0.tgz b/test/ix-chart/2111.0.1/charts/common-2105.0.0.tgz deleted file mode 100644 index 201c3caeeb..0000000000 Binary files a/test/ix-chart/2111.0.1/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/test/ix-chart/2111.0.1/charts/common-2112.0.0.tgz b/test/ix-chart/2111.0.1/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62c214e1c8 Binary files /dev/null and b/test/ix-chart/2111.0.1/charts/common-2112.0.0.tgz differ diff --git a/test/machinaris/1.0.11/Chart.yaml b/test/machinaris/1.0.11/Chart.yaml index 60ba06d412..2dd13f5a7f 100644 --- a/test/machinaris/1.0.11/Chart.yaml +++ b/test/machinaris/1.0.11/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: v0.6.1 dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: Global, Versioned, peer-to-peer filesystem. home: https://github.com/guydavis/machinaris icon: https://raw.githubusercontent.com/guydavis/machinaris/main/web/static/favicon.ico diff --git a/test/machinaris/1.0.11/charts/common-2105.0.0.tgz b/test/machinaris/1.0.11/charts/common-2105.0.0.tgz deleted file mode 100644 index ef6f820efb..0000000000 Binary files a/test/machinaris/1.0.11/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/test/machinaris/1.0.11/charts/common-2112.0.0.tgz b/test/machinaris/1.0.11/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62c214e1c8 Binary files /dev/null and b/test/machinaris/1.0.11/charts/common-2112.0.0.tgz differ diff --git a/test/machinaris/1.0.11/requirements.lock b/test/machinaris/1.0.11/requirements.lock index eba13d88bf..e858f1a03f 100644 --- a/test/machinaris/1.0.11/requirements.lock +++ b/test/machinaris/1.0.11/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-17T18:26:46.201544+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:24:36.651122+05:00" diff --git a/test/minio/1.4.7/Chart.yaml b/test/minio/1.4.7/Chart.yaml index 76335b3eb2..b8a026b06d 100644 --- a/test/minio/1.4.7/Chart.yaml +++ b/test/minio/1.4.7/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 appVersion: '2021-11-24' dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: High Performance, Kubernetes Native Object Storage home: https://min.io icon: https://min.io/resources/img/logo/MINIO_wordmark.png diff --git a/test/minio/1.4.7/charts/common-2105.0.0.tgz b/test/minio/1.4.7/charts/common-2105.0.0.tgz deleted file mode 100644 index 6a406ffcec..0000000000 Binary files a/test/minio/1.4.7/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/test/minio/1.4.7/charts/common-2112.0.0.tgz b/test/minio/1.4.7/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62c214e1c8 Binary files /dev/null and b/test/minio/1.4.7/charts/common-2112.0.0.tgz differ diff --git a/test/minio/1.4.7/requirements.lock b/test/minio/1.4.7/requirements.lock index 28e1370a83..7d9c01b810 100644 --- a/test/minio/1.4.7/requirements.lock +++ b/test/minio/1.4.7/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-10T13:07:35.423192+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:24:36.62541+05:00" diff --git a/test/nextcloud/1.3.11/Chart.lock b/test/nextcloud/1.3.11/Chart.lock index 9395bdf3f9..e3c2813282 100644 --- a/test/nextcloud/1.3.11/Chart.lock +++ b/test/nextcloud/1.3.11/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-10T13:07:35.317071+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:28:23.230939+05:00" diff --git a/test/nextcloud/1.3.11/Chart.yaml b/test/nextcloud/1.3.11/Chart.yaml index 727f1ebbbf..a24a2b8cf2 100644 --- a/test/nextcloud/1.3.11/Chart.yaml +++ b/test/nextcloud/1.3.11/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: '23' dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: A file sharing server that puts the control and security of your own data back into your hands. home: https://nextcloud.com/ diff --git a/test/nextcloud/1.3.11/charts/common-2105.0.0.tgz b/test/nextcloud/1.3.11/charts/common-2105.0.0.tgz deleted file mode 100644 index 6a406ffcec..0000000000 Binary files a/test/nextcloud/1.3.11/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/test/nextcloud/1.3.11/charts/common-2112.0.0.tgz b/test/nextcloud/1.3.11/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62c214e1c8 Binary files /dev/null and b/test/nextcloud/1.3.11/charts/common-2112.0.0.tgz differ diff --git a/test/nextcloud/1.3.11/requirements.lock b/test/nextcloud/1.3.11/requirements.lock new file mode 100644 index 0000000000..4a7c02f48d --- /dev/null +++ b/test/nextcloud/1.3.11/requirements.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 +generated: "2021-05-10T13:07:35.423192+05:00" diff --git a/test/plex/1.6.13/Chart.lock b/test/plex/1.6.13/Chart.lock index e0a3597a26..c186a59bae 100644 --- a/test/plex/1.6.13/Chart.lock +++ b/test/plex/1.6.13/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-10T13:07:35.458234+05:00" + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 +digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 +generated: "2021-12-06T21:24:36.698767+05:00" diff --git a/test/plex/1.6.13/Chart.yaml b/test/plex/1.6.13/Chart.yaml index 45c00b0a2c..2eecca4727 100644 --- a/test/plex/1.6.13/Chart.yaml +++ b/test/plex/1.6.13/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: 1.25.0.5282 dependencies: - name: common - repository: file://../../../library/common/2105.0.0 - version: 2105.0.0 + repository: file://../../../library/common/2112.0.0 + version: 2112.0.0 description: Plex Media Server home: https://plex.tv/ icon: https://www.plex.tv/wp-content/uploads/2018/01/pmp-icon-1.png diff --git a/test/plex/1.6.13/charts/common-2105.0.0.tgz b/test/plex/1.6.13/charts/common-2105.0.0.tgz deleted file mode 100644 index 6a406ffcec..0000000000 Binary files a/test/plex/1.6.13/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/test/plex/1.6.13/charts/common-2112.0.0.tgz b/test/plex/1.6.13/charts/common-2112.0.0.tgz new file mode 100644 index 0000000000..62c214e1c8 Binary files /dev/null and b/test/plex/1.6.13/charts/common-2112.0.0.tgz differ