Skip to content

Commit b4ffd79

Browse files
fix(kustomize): ensures compatibility with v5 (#365)
Signed-off-by: Bartosz Majsak <[email protected]>
1 parent cebfb51 commit b4ffd79

File tree

4 files changed

+54
-57
lines changed

4 files changed

+54
-57
lines changed

config/overlays/odh/default/kustomization.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
apiVersion: kustomize.config.k8s.io/v1beta1
32
kind: Kustomization
43
resources:
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
varReference:
2-
- path: spec/template/spec/containers[]/image
2+
- path: spec/template/spec/containers/image
33
kind: Deployment
4-
apiVersion: apps/v1
Lines changed: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,68 @@
1-
---
21
apiVersion: kustomize.config.k8s.io/v1beta1
32
kind: Kustomization
3+
44
resources:
5-
- ../../prometheus
6-
- ./default
7-
- ./scripts
8-
- ./quickstart.yaml
9-
- ./rbac
5+
- ../../prometheus
6+
- ./default
7+
- ./scripts
8+
- ./quickstart.yaml
9+
- ./rbac
1010

1111
namespace: opendatahub
1212
configMapGenerator:
13-
- envs:
14-
- params.env
15-
name: mesh-parameters
13+
- envs:
14+
- params.env
15+
name: mesh-parameters
1616
generatorOptions:
1717
disableNameSuffixHash: true
1818

19+
patches:
20+
- path: ./crd/clusterservingruntime_patch_delete.yaml
1921

2022
vars:
21-
- fieldref:
22-
fieldPath: metadata.namespace
23-
name: mesh-namespace
24-
objref:
25-
apiVersion: v1
26-
kind: ConfigMap
27-
name: mesh-parameters
28-
- fieldref:
29-
fieldPath: data.odh-modelmesh
30-
name: odh-modelmesh
31-
objref:
32-
apiVersion: v1
33-
kind: ConfigMap
34-
name: mesh-parameters
35-
- fieldref:
36-
fieldPath: data.odh-mm-rest-proxy
37-
name: odh-mm-rest-proxy
38-
objref:
39-
apiVersion: v1
40-
kind: ConfigMap
41-
name: mesh-parameters
42-
- fieldref:
43-
fieldPath: data.odh-modelmesh-runtime-adapter
44-
name: odh-modelmesh-runtime-adapter
45-
objref:
46-
apiVersion: v1
47-
kind: ConfigMap
48-
name: mesh-parameters
49-
- fieldref:
50-
fieldPath: data.odh-modelmesh-controller
51-
name: odh-modelmesh-controller
52-
objref:
53-
apiVersion: v1
54-
kind: ConfigMap
55-
name: mesh-parameters
23+
- fieldref:
24+
fieldPath: metadata.namespace
25+
name: mesh-namespace
26+
objref:
27+
apiVersion: v1
28+
kind: ConfigMap
29+
name: mesh-parameters
30+
- fieldref:
31+
fieldPath: data.odh-modelmesh
32+
name: odh-modelmesh
33+
objref:
34+
apiVersion: v1
35+
kind: ConfigMap
36+
name: mesh-parameters
37+
- fieldref:
38+
fieldPath: data.odh-mm-rest-proxy
39+
name: odh-mm-rest-proxy
40+
objref:
41+
apiVersion: v1
42+
kind: ConfigMap
43+
name: mesh-parameters
44+
- fieldref:
45+
fieldPath: data.odh-modelmesh-runtime-adapter
46+
name: odh-modelmesh-runtime-adapter
47+
objref:
48+
apiVersion: v1
49+
kind: ConfigMap
50+
name: mesh-parameters
51+
- fieldref:
52+
fieldPath: data.odh-modelmesh-controller
53+
name: odh-modelmesh-controller
54+
objref:
55+
apiVersion: v1
56+
kind: ConfigMap
57+
name: mesh-parameters
5658

57-
commonLabels:
58-
app: model-mesh
59-
app.kubernetes.io/part-of: model-mesh
6059

61-
patchesStrategicMerge:
62-
- ./crd/clusterservingruntime_patch_delete.yaml
6360

6461
configurations:
65-
- params.yaml
62+
- params.yaml
63+
64+
labels:
65+
- includeSelectors: true
66+
pairs:
67+
app: model-mesh
68+
app.kubernetes.io/part-of: model-mesh

config/overlays/odh/params.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
varReference:
22
- path: metadata/namespace
33
kind: ServiceAccount
4-
apiVersion: v1
54
- path: metadata/name
65
kind: ClusterRoleBinding
7-
apiGroup: rbac.authorization.k8s.io
86
- path: subjects/namespace
97
kind: RoleBinding
10-
apiGroup: rbac.authorization.k8s.io
118
- path: spec/template/spec/containers[]/image
129
kind: Deployment
13-
apiVersion: apps/v1
1410
- path: data
1511
kind: ConfigMap

0 commit comments

Comments
 (0)