Skip to content

Commit dbf1b9e

Browse files
author
Cloud User
committed
compatibility with kube 1.25
1 parent dcb7917 commit dbf1b9e

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

build/deploy/base.libsonnet

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ local util = import 'util.libsonnet';
77
metadata: {
88
name: name,
99
namespace: metadata.namespace,
10-
clusterName: metadata.clusterName,
1110
labels: {
1211
name: std.join('-', std.split(name, ':')),
1312
},
1413
},
1514
},
1615

17-
_RoleRelated(kind, metadata, name): $._Object('rbac.authorization.k8s.io/v1beta1', kind, metadata, name) {
16+
_RoleRelated(kind, metadata, name): $._Object('rbac.authorization.k8s.io/v1', kind, metadata, name) {
1817
local rr = self,
1918
app:: "",
2019
metadata+: {
@@ -54,7 +53,7 @@ local util = import 'util.libsonnet';
5453

5554
},
5655

57-
PodDisruptionBudget(metadata, name): $._Object('policy/v1beta1', 'PodDisruptionBudget', metadata, name) {
56+
PodDisruptionBudget(metadata, name): $._Object('policy/v1', 'PodDisruptionBudget', metadata, name) {
5857
local pdb = self,
5958
app:: error "must specify app",
6059
metadata+: {

onesky/dss-ingress.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: networking.k8s.io/v1beta1
1+
apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: onesky-http-gateway-ingress
@@ -10,14 +10,16 @@ metadata:
1010
spec:
1111
tls:
1212
- hosts:
13-
- dss-ohio.oneskysystems.com
13+
- dss-navcanada.oneskysystems.com
1414
secretName: dss-tls
1515
rules:
16-
- host: dss-ohio.oneskysystems.com
16+
- host: dss-navcanada.oneskysystems.com
1717
http:
1818
paths:
1919
- path: /
2020
pathType: Prefix
2121
backend:
22-
serviceName: "http-gateway"
23-
servicePort: 8080
22+
service:
23+
name: "http-gateway"
24+
port:
25+
number: 8080

onesky/grafana-ingress.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: networking.k8s.io/v1beta1
1+
apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: onesky-grafana-ingress
@@ -11,14 +11,16 @@ metadata:
1111
spec:
1212
tls:
1313
- hosts:
14-
- dss-ohio.oneskysystems.com
14+
- dss-navcanada.oneskysystems.com
1515
secretName: dss-tls
1616
rules:
17-
- host: dss-ohio.oneskysystems.com
17+
- host: dss-navcanada.oneskysystems.com
1818
http:
1919
paths:
2020
- path: /grafana(/|$)(.*)
2121
pathType: Prefix
2222
backend:
23-
serviceName: "grafana"
24-
servicePort: 3000
23+
service:
24+
name: "grafana"
25+
port:
26+
number: 3000

0 commit comments

Comments
 (0)