Skip to content

Commit 9795dfb

Browse files
committed
chore: wip update deps
1 parent 15eb29f commit 9795dfb

File tree

5 files changed

+50
-49
lines changed

5 files changed

+50
-49
lines changed

chart/Chart.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dependencies:
2-
- name: nginx-ingress
3-
repository: https://kubernetes-charts.storage.googleapis.com
4-
version: 1.28.2
2+
- name: ingress-nginx
3+
repository: https://kubernetes.github.io/ingress-nginx
4+
version: 4.4.2
55
- name: cert-manager
66
repository: https://charts.jetstack.io
7-
version: v0.12.0
8-
- name: prometheus-operator
9-
repository: https://kubernetes-charts.storage.googleapis.com
10-
version: 8.5.4
11-
digest: sha256:0e8987ebbff72192ebb651ec5110187d4d7bb9b87dbfa962c569b5b0dd79c67c
12-
generated: "2020-01-09T20:59:57.36369708+08:00"
7+
version: v1.10.2
8+
- name: kube-prometheus-stack
9+
repository: https://prometheus-community.github.io/helm-charts
10+
version: 43.2.1
11+
digest: sha256:300e10390742857b55c5c00fccf223826caa4b5d27893bc992c481e9bc459c63
12+
generated: "2023-01-11T19:12:07.884026725+08:00"

chart/Chart.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ sources:
1818

1919
# chart dependencies
2020
dependencies:
21-
- name: nginx-ingress
22-
version: 1.28.2
23-
repository: https://kubernetes-charts.storage.googleapis.com
21+
- name: ingress-nginx
22+
version: 4.4.2
23+
repository: https://kubernetes.github.io/ingress-nginx
2424
condition: nginx-ingress.enabled
2525
- name: cert-manager
26-
version: 0.12.0
26+
version: 1.10.2
2727
repository: https://charts.jetstack.io
2828
condition: cert-manager.enabled
29-
- name: prometheus-operator
30-
version: 8.5.4
31-
repository: https://kubernetes-charts.storage.googleapis.com
29+
- name: kube-prometheus-stack
30+
version: 43.2.1
31+
repository: https://prometheus-community.github.io/helm-charts
3232
condition: prometheus-operator.enabled

chart/templates/certs/issuer.yml

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,32 @@
66

77
{{if ".Values.certGenerate.enabled" -}}
88

9-
apiVersion: cert-manager.io/v1alpha2
10-
kind: Issuer
11-
metadata:
12-
{{- if ne .Values.environment "production" }}
13-
name: {{ .Release.Name }}-letsencrypt-staging
14-
{{- else }}
15-
name: {{ .Release.Name }}-letsencrypt-production
16-
{{- end }}
17-
spec:
18-
acme:
19-
# The ACME server URL
20-
{{- if ne .Values.environment "production" }}
21-
server: https://acme-staging-v02.api.letsencrypt.org/directory
22-
{{- else }}
23-
server: https://acme-v02.api.letsencrypt.org/directory
24-
{{- end }}
25-
# Email address used for ACME registration
26-
email: {{ .Values.certGenerate.email }}
27-
# Name of a secret used to store the ACME account private key
28-
privateKeySecretRef:
29-
name: issuer-letsencrypt-staging-key
30-
# Enable the HTTP-01 challenge provider
31-
solvers:
32-
- http01:
33-
ingress:
34-
class: nginx
9+
# TODO - temp disable since no requirement for certs for now
10+
# apiVersion: cert-manager.io/v1
11+
# kind: Certificate
12+
# metadata:
13+
# {{- if ne .Values.environment "production" }}
14+
# name: {{ .Release.Name }}-letsencrypt-staging
15+
# {{- else }}
16+
# name: {{ .Release.Name }}-letsencrypt-production
17+
# {{- end }}
18+
# spec:
19+
# acme:
20+
# # The ACME server URL
21+
# {{- if ne .Values.environment "production" }}
22+
# server: https://acme-staging-v02.api.letsencrypt.org/directory
23+
# {{- else }}
24+
# server: https://acme-v02.api.letsencrypt.org/directory
25+
# {{- end }}
26+
# # Email address used for ACME registration
27+
# email: {{ .Values.certGenerate.email }}
28+
# # Name of a secret used to store the ACME account private key
29+
# privateKeySecretRef:
30+
# name: issuer-letsencrypt-staging-key
31+
# # Enable the HTTP-01 challenge provider
32+
# solvers:
33+
# - http01:
34+
# ingress:
35+
# class: nginx
3536

3637
{{- end -}}

chart/templates/ingress.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
{{- if .Values.ingress.enabled }}
77

8-
apiVersion: networking.k8s.io/v1beta1
8+
apiVersion: networking.k8s.io/v1
99
kind: Ingress
1010
metadata:
1111
name: {{ include "k8s-cms.fullname" . }}

deps/cert-manager/custom-resources.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
---
3-
apiVersion: apiextensions.k8s.io/v1beta1
3+
apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
creationTimestamp: null
@@ -187,7 +187,7 @@ status:
187187
---
188188

189189
---
190-
apiVersion: apiextensions.k8s.io/v1beta1
190+
apiVersion: apiextensions.k8s.io/v1
191191
kind: CustomResourceDefinition
192192
metadata:
193193
creationTimestamp: null
@@ -483,7 +483,7 @@ status:
483483
---
484484

485485
---
486-
apiVersion: apiextensions.k8s.io/v1beta1
486+
apiVersion: apiextensions.k8s.io/v1
487487
kind: CustomResourceDefinition
488488
metadata:
489489
creationTimestamp: null
@@ -1896,7 +1896,7 @@ status:
18961896
---
18971897

18981898
---
1899-
apiVersion: apiextensions.k8s.io/v1beta1
1899+
apiVersion: apiextensions.k8s.io/v1
19001900
kind: CustomResourceDefinition
19011901
metadata:
19021902
creationTimestamp: null
@@ -3871,7 +3871,7 @@ status:
38713871
---
38723872

38733873
---
3874-
apiVersion: apiextensions.k8s.io/v1beta1
3874+
apiVersion: apiextensions.k8s.io/v1
38753875
kind: CustomResourceDefinition
38763876
metadata:
38773877
creationTimestamp: null
@@ -5846,7 +5846,7 @@ status:
58465846
---
58475847

58485848
---
5849-
apiVersion: apiextensions.k8s.io/v1beta1
5849+
apiVersion: apiextensions.k8s.io/v1
58505850
kind: CustomResourceDefinition
58515851
metadata:
58525852
creationTimestamp: null

0 commit comments

Comments
 (0)