diff --git a/docs/index.yaml b/docs/index.yaml index 2b3e9a8..f2de1be 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -3,7 +3,22 @@ entries: vmpooler: - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2022-03-29T14:51:03.225109-05:00" + created: "2022-03-30T13:45:09.325403-05:00" + dependencies: + - name: redis + repository: https://charts.bitnami.com/bitnami + version: 13.0.1 + description: A Helm chart to deploy vmpooler + digest: f6143e19dfe368b6aa48eb862ca47b474ecd10c4aac3403a78acd8ec6de689bb + icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png + name: vmpooler + type: application + urls: + - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.10.0.tgz + version: 1.10.0 + - apiVersion: v2 + appVersion: 1.2.0-prod-all-providers + created: "2022-03-30T13:45:09.362397-05:00" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -18,7 +33,7 @@ entries: version: 1.9.0 - apiVersion: v2 appVersion: 1.2.0-prod-all-providers - created: "2022-03-29T14:51:03.221663-05:00" + created: "2022-03-30T13:45:09.357526-05:00" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -33,7 +48,7 @@ entries: version: 1.8.0 - apiVersion: v2 appVersion: 1.0.0-prod-all-providers - created: "2022-03-29T14:51:03.217074-05:00" + created: "2022-03-30T13:45:09.353298-05:00" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -48,7 +63,7 @@ entries: version: 1.7.1 - apiVersion: v2 appVersion: 1.0.0-prod-all-providers - created: "2022-03-29T14:51:03.213072-05:00" + created: "2022-03-30T13:45:09.348707-05:00" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -63,7 +78,7 @@ entries: version: 1.7.0 - apiVersion: v2 appVersion: 1.3.0 - created: "2022-03-29T14:51:03.20817-05:00" + created: "2022-03-30T13:45:09.344263-05:00" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -78,7 +93,7 @@ entries: version: 1.6.3 - apiVersion: v2 appVersion: 1.3.0 - created: "2022-03-29T14:51:03.203812-05:00" + created: "2022-03-30T13:45:09.339826-05:00" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -93,7 +108,7 @@ entries: version: 1.6.2 - apiVersion: v2 appVersion: 1.3.0 - created: "2022-03-29T14:51:03.199639-05:00" + created: "2022-03-30T13:45:09.335088-05:00" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -108,7 +123,7 @@ entries: version: 1.6.1 - apiVersion: v2 appVersion: 1.3.0 - created: "2022-03-29T14:51:03.194252-05:00" + created: "2022-03-30T13:45:09.331129-05:00" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami @@ -121,4 +136,4 @@ entries: urls: - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz version: 1.6.0 -generated: "2022-03-29T14:51:03.188926-05:00" +generated: "2022-03-30T13:45:09.3191-05:00" diff --git a/docs/vmpooler-1.10.0.tgz b/docs/vmpooler-1.10.0.tgz new file mode 100644 index 0000000..76c2993 Binary files /dev/null and b/docs/vmpooler-1.10.0.tgz differ diff --git a/helm-charts/vmpooler/Chart.yaml b/helm-charts/vmpooler/Chart.yaml index 25d9a2f..41615d2 100644 --- a/helm-charts/vmpooler/Chart.yaml +++ b/helm-charts/vmpooler/Chart.yaml @@ -3,7 +3,7 @@ name: vmpooler description: A Helm chart to deploy vmpooler type: application icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png -version: 1.9.0 +version: 1.10.0 appVersion: 1.2.0-prod-all-providers dependencies: - name: redis diff --git a/helm-charts/vmpooler/charts/redis-10.7.12.tgz b/helm-charts/vmpooler/charts/redis-10.7.12.tgz deleted file mode 100644 index 1ff3e4e..0000000 Binary files a/helm-charts/vmpooler/charts/redis-10.7.12.tgz and /dev/null differ diff --git a/helm-charts/vmpooler/charts/redis-13.0.1.tgz b/helm-charts/vmpooler/charts/redis-13.0.1.tgz new file mode 100644 index 0000000..7b7267d Binary files /dev/null and b/helm-charts/vmpooler/charts/redis-13.0.1.tgz differ diff --git a/helm-charts/vmpooler/templates/deployment-api.yaml b/helm-charts/vmpooler/templates/deployment-api.yaml index 290765b..5a3b5e3 100644 --- a/helm-charts/vmpooler/templates/deployment-api.yaml +++ b/helm-charts/vmpooler/templates/deployment-api.yaml @@ -11,6 +11,9 @@ metadata: annotations: configmap.reloader.stakater.com/reload: "{{ .Values.configmapName }},vmpooler-pools" secret.reloader.stakater.com/reload: 'redis' + {{- with .Values.api.annotations }} + {{- toYaml . | nindent 8 }} + {{- end }} spec: replicas: {{ .Values.api.replicaCount }} selector: @@ -72,7 +75,7 @@ spec: - name: VMPOOLER_TRACING_JAEGER_HOST value: '{{ .Values.tracing.jaegerHost }}' - name: EXTRA_CONFIG - value: '/etc/vmpooler/config/pools.yaml' + value: '{{ .Values.additionalConfigFiles }}' - name: REDIS_SERVER value: 'redis-master' - name: ONDEMAND_REQUEST_TTL