Skip to content

Commit d16f9b5

Browse files
suckatrashsuckatrash
authored
Merge pull request #42 from puppetlabs/maint_vmpooler_ingress
(DIO-3157) Update ingress for k8s 1.22
2 parents b3270c2 + 7bb5f37 commit d16f9b5

File tree

8 files changed

+56
-27
lines changed

8 files changed

+56
-27
lines changed

‎docs/index.yaml‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,22 @@ entries:
33
vmpooler:
44
- apiVersion: v2
55
appVersion: 1.5.0-prod-all-providers
6-
created: "2022-04-19T10:04:21.870717-04:00"
6+
created: "2022-06-06T17:18:54.124017643Z"
7+
dependencies:
8+
- name: redis
9+
repository: https://charts.bitnami.com/bitnami
10+
version: 16.10.1
11+
description: A Helm chart to deploy vmpooler
12+
digest: 6d7bd0a41ac8f27792d1c232b6cf0c1b47ddf3b8113146098ed36160c6b9d373
13+
icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
14+
name: vmpooler
15+
type: application
16+
urls:
17+
- https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.13.0.tgz
18+
version: 1.13.0
19+
- apiVersion: v2
20+
appVersion: 1.5.0-prod-all-providers
21+
created: "2022-06-06T17:18:54.117163396Z"
722
dependencies:
823
- name: redis
924
repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
1833
version: 1.12.0
1934
- apiVersion: v2
2035
appVersion: 1.4.0-prod-all-providers
21-
created: "2022-04-19T10:04:21.864097-04:00"
36+
created: "2022-06-06T17:18:54.112765666Z"
2237
dependencies:
2338
- name: redis
2439
repository: https://charts.bitnami.com/bitnami
@@ -33,7 +48,7 @@ entries:
3348
version: 1.11.1
3449
- apiVersion: v2
3550
appVersion: 1.3.0-prod-all-providers
36-
created: "2022-04-19T10:04:21.85893-04:00"
51+
created: "2022-06-06T17:18:54.107092528Z"
3752
dependencies:
3853
- name: redis
3954
repository: https://charts.bitnami.com/bitnami
@@ -48,7 +63,7 @@ entries:
4863
version: 1.11.0
4964
- apiVersion: v2
5065
appVersion: 1.2.0-prod-all-providers
51-
created: "2022-04-19T10:04:21.852303-04:00"
66+
created: "2022-06-06T17:18:54.100796285Z"
5267
dependencies:
5368
- name: redis
5469
repository: https://charts.bitnami.com/bitnami
@@ -63,7 +78,7 @@ entries:
6378
version: 1.10.1
6479
- apiVersion: v2
6580
appVersion: 1.2.0-prod-all-providers
66-
created: "2022-04-19T10:04:21.846676-04:00"
81+
created: "2022-06-06T17:18:54.095674451Z"
6782
dependencies:
6883
- name: redis
6984
repository: https://charts.bitnami.com/bitnami
@@ -78,7 +93,7 @@ entries:
7893
version: 1.10.0
7994
- apiVersion: v2
8095
appVersion: 1.2.0-prod-all-providers
81-
created: "2022-04-19T10:04:21.90604-04:00"
96+
created: "2022-06-06T17:18:54.157081966Z"
8297
dependencies:
8398
- name: redis
8499
repository: https://charts.bitnami.com/bitnami
@@ -93,7 +108,7 @@ entries:
93108
version: 1.9.0
94109
- apiVersion: v2
95110
appVersion: 1.2.0-prod-all-providers
96-
created: "2022-04-19T10:04:21.901372-04:00"
111+
created: "2022-06-06T17:18:54.153793944Z"
97112
dependencies:
98113
- name: redis
99114
repository: https://charts.bitnami.com/bitnami
@@ -108,7 +123,7 @@ entries:
108123
version: 1.8.0
109124
- apiVersion: v2
110125
appVersion: 1.0.0-prod-all-providers
111-
created: "2022-04-19T10:04:21.897342-04:00"
126+
created: "2022-06-06T17:18:54.148988211Z"
112127
dependencies:
113128
- name: redis
114129
repository: https://charts.bitnami.com/bitnami
@@ -123,7 +138,7 @@ entries:
123138
version: 1.7.1
124139
- apiVersion: v2
125140
appVersion: 1.0.0-prod-all-providers
126-
created: "2022-04-19T10:04:21.893321-04:00"
141+
created: "2022-06-06T17:18:54.145584388Z"
127142
dependencies:
128143
- name: redis
129144
repository: https://charts.bitnami.com/bitnami
@@ -138,7 +153,7 @@ entries:
138153
version: 1.7.0
139154
- apiVersion: v2
140155
appVersion: 1.3.0
141-
created: "2022-04-19T10:04:21.888365-04:00"
156+
created: "2022-06-06T17:18:54.142103665Z"
142157
dependencies:
143158
- name: redis
144159
repository: https://charts.bitnami.com/bitnami
@@ -153,7 +168,7 @@ entries:
153168
version: 1.6.3
154169
- apiVersion: v2
155170
appVersion: 1.3.0
156-
created: "2022-04-19T10:04:21.883885-04:00"
171+
created: "2022-06-06T17:18:54.137599334Z"
157172
dependencies:
158173
- name: redis
159174
repository: https://charts.bitnami.com/bitnami
@@ -168,7 +183,7 @@ entries:
168183
version: 1.6.2
169184
- apiVersion: v2
170185
appVersion: 1.3.0
171-
created: "2022-04-19T10:04:21.878862-04:00"
186+
created: "2022-06-06T17:18:54.133191405Z"
172187
dependencies:
173188
- name: redis
174189
repository: https://charts.bitnami.com/bitnami
@@ -183,7 +198,7 @@ entries:
183198
version: 1.6.1
184199
- apiVersion: v2
185200
appVersion: 1.3.0
186-
created: "2022-04-19T10:04:21.874923-04:00"
201+
created: "2022-06-06T17:18:54.128352972Z"
187202
dependencies:
188203
- name: redis
189204
repository: https://charts.bitnami.com/bitnami
@@ -196,4 +211,4 @@ entries:
196211
urls:
197212
- https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
198213
version: 1.6.0
199-
generated: "2022-04-19T10:04:21.8396-04:00"
214+
generated: "2022-06-06T17:18:54.08662519Z"

‎docs/vmpooler-1.13.0.tgz‎

92.2 KB
Binary file not shown.

‎helm-charts/vmpooler/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: redis
33
repository: https://charts.bitnami.com/bitnami
4-
version: 13.0.1
5-
digest: sha256:7682a105e52b2e1bdd3441f59cc390e0d546655204ae5009295ec3253a25e230
6-
generated: "2022-03-28T11:00:18.357837-05:00"
4+
version: 16.10.1
5+
digest: sha256:b4278d10dd3a151323b761106d2ab00a742b08984d05e9102f852815d69d1a6a
6+
generated: "2022-06-03T11:04:59.151842094-07:00"

‎helm-charts/vmpooler/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: vmpooler
33
description: A Helm chart to deploy vmpooler
44
type: application
55
icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
6-
version: 1.12.0
6+
version: 1.13.0
77
appVersion: 1.5.0-prod-all-providers
88
dependencies:
99
- name: redis
1010
repository: https://charts.bitnami.com/bitnami
11-
version: 13.0.1
11+
version: 16.10.1

‎helm-charts/vmpooler/charts/redis-13.0.1.tgz‎

-74.3 KB
Binary file not shown.

‎helm-charts/vmpooler/charts/redis-16.10.1.tgz‎

86 KB
Binary file not shown.

‎helm-charts/vmpooler/templates/ingress.yaml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{{- if .Values.ingress.enabled -}}
22
{{- $fullName := include "vmpooler.fullname" . -}}
33
{{- $svcPort := .Values.service.port -}}
4-
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
4+
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
5+
apiVersion: networking.k8s.io/v1
6+
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
57
apiVersion: networking.k8s.io/v1beta1
68
{{- else -}}
79
apiVersion: extensions/v1beta1
@@ -21,9 +23,19 @@ spec:
2123
http:
2224
paths:
2325
- backend:
26+
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
27+
service:
28+
name: {{ $fullName }}-api
29+
port:
30+
number: {{ $svcPort }}
31+
{{- else }}
2432
serviceName: {{ $fullName }}-api
2533
servicePort: {{ $svcPort }}
34+
{{- end }}
2635
path: /
36+
{{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
37+
pathType: ImplementationSpecific
38+
{{- end }}
2739
{{ if .Values.ingress.useTLS -}}
2840
tls:
2941
- hosts:

‎helm-charts/vmpooler/values.yaml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ configmapName: 'vmpooler-baseconfig'
1010
sut_domain: 'vmpooler.example.com'
1111
usage_stats: true
1212

13+
# .json private key, set in ENV var
1314
gce:
14-
keyfile: '/vault/secrets/gce-keyfile.json' #.json private key, set in ENV var
15+
keyfile: '/vault/secrets/gce-keyfile.json'
1516

1617
tracing:
1718
enabled: 'false'
@@ -112,15 +113,16 @@ affinity: {}
112113
# For a full list of parameters see: https://github.com/bitnami/charts/tree/master/bitnami/redis/
113114
redis:
114115
fullnameOverride: redis
115-
cluster:
116-
enabled: false
116+
architecture: standalone
117117
networkPolicy:
118118
enabled: true
119-
securityContext:
120-
enabled: true
121-
fsGroup: 1001
122-
runAsUser: 1001
123119
master:
120+
podSecurityContext:
121+
enabled: true
122+
fsGroup: 1001
123+
containerSecurityContext:
124+
enabled: true
125+
runAsUser: 1001
124126
resources:
125127
requests:
126128
cpu: 1000m

0 commit comments

Comments
 (0)