Skip to content

Commit 067f072

Browse files
deprecate v1beta1/Ingress in chart (cesanta#306)
1 parent 2a24c91 commit 067f072

File tree

5 files changed

+46
-7
lines changed

5 files changed

+46
-7
lines changed

chart/docker-auth/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: "1.7.0"
33
description: Docker Registry V2 authentication server
44
name: docker-auth
5-
version: 1.1.1
5+
version: 1.2.0
66
keywords:
77
- docker
88
- registry

chart/docker-auth/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Install the docker-auth helm chart:
1616
Add repository to helm
1717

1818
```bash
19-
helm repo add cesanta-charts https://cesanta.github.io/docker_auth/
19+
helm repo add cesanta https://cesanta.github.io/docker_auth/
2020
helm repo update
2121
```
2222

2323
Installation:
2424

2525
```bash
2626
helm dependency update
27-
helm install --name=docker-auth cesanta-charts/docker_auth
27+
helm install --name=docker-auth cesanta/docker-auth
2828
```
2929

3030
To delete the `my-release` deployment, run:

chart/docker-auth/templates/ingress.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
{{- $serviceName := include "docker-auth.fullname" . -}}
33
{{- $servicePort := .Values.service.port -}}
44
{{- $path := .Values.ingress.path -}}
5+
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
56
apiVersion: networking.k8s.io/v1
7+
{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" -}}
8+
apiVersion: networking.k8s.io/v1beta1
9+
{{- else -}}
10+
apiVersion: extensions/v1beta1
11+
{{- end }}
612
kind: Ingress
713
metadata:
814
name: {{ template "docker-auth.fullname" . }}
@@ -25,9 +31,19 @@ spec:
2531
http:
2632
paths:
2733
- path: {{ $path }}
34+
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
35+
pathType: Prefix
36+
{{- end }}
2837
backend:
38+
{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
39+
service:
40+
name: {{ $serviceName }}
41+
port:
42+
number: {{ $servicePort }}
43+
{{- else }}
2944
serviceName: {{ $serviceName }}
3045
servicePort: {{ $servicePort }}
46+
{{- end }}
3147
{{- end -}}
3248
{{- if .Values.ingress.tls }}
3349
tls:

docs/docker-auth-1.2.0.tgz

6 KB
Binary file not shown.

docs/index.yaml

+27-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,30 @@ entries:
33
docker-auth:
44
- apiVersion: v2
55
appVersion: 1.7.0
6-
created: "2021-03-07T02:07:08.025909-05:00"
6+
created: "2021-03-09T22:56:13.951514-05:00"
7+
description: Docker Registry V2 authentication server
8+
digest: 6bbc2e554c5b3f27cf063dd23fc52f6f0ff227c0b97e6772cfcbaf178375ba19
9+
home: https://github.com/cesanta/docker_auth
10+
keywords:
11+
- docker
12+
- registry
13+
- docker-auth
14+
- docker-registry
15+
- token
16+
maintainers:
17+
18+
name: duyanghao
19+
20+
name: pfisterer
21+
name: docker-auth
22+
sources:
23+
- https://github.com/cesanta/docker_auth
24+
urls:
25+
- https://cesanta.github.io/docker_auth/docker-auth-1.2.0.tgz
26+
version: 1.2.0
27+
- apiVersion: v2
28+
appVersion: 1.7.0
29+
created: "2021-03-09T22:56:13.948893-05:00"
730
description: Docker Registry V2 authentication server
831
digest: add7b754e9b8ff9f0b9e839c0759aebb3e6a59f0db91a111b5c92009a5bd1ab6
932
home: https://github.com/cesanta/docker_auth
@@ -26,7 +49,7 @@ entries:
2649
version: 1.1.1
2750
- apiVersion: v2
2851
appVersion: 1.7.0
29-
created: "2021-03-07T02:07:08.024946-05:00"
52+
created: "2021-03-09T22:56:13.946489-05:00"
3053
description: Docker Registry V2 authentication server
3154
digest: e20ff37b10dcfaa3b7cfcf78d6b9bdabfb5b1bfcdb2384fcd5ba99459297df56
3255
home: https://github.com/cesanta/docker_auth
@@ -49,7 +72,7 @@ entries:
4972
version: 1.1.0
5073
- apiVersion: v2
5174
appVersion: 1.4.0
52-
created: "2021-03-07T02:07:08.02354-05:00"
75+
created: "2021-03-09T22:56:13.943393-05:00"
5376
description: Docker Registry V2 authentication server
5477
digest: 7842a1c2672bb63393cec4df2ec6f554d114e32dcc91ced98e427f365be423c7
5578
home: https://github.com/cesanta/docker_auth
@@ -70,4 +93,4 @@ entries:
7093
urls:
7194
- https://cesanta.github.io/docker_auth/docker-auth-1.0.3.tgz
7295
version: 1.0.3
73-
generated: "2021-03-07T02:07:08.020068-05:00"
96+
generated: "2021-03-09T22:56:13.935846-05:00"

0 commit comments

Comments
 (0)