Skip to content

Commit da72660

Browse files
pedrovgppedrovgp
committed
FIX deprecation warnings
Signed-off-by: Pedro Viana <[email protected]>
1 parent 23d15cf commit da72660

File tree

6 files changed

+136
-43
lines changed

6 files changed

+136
-43
lines changed

‎apps/katib/upstream/installs/katib-cert-manager/certificate.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ metadata:
55
name: katib-webhook-cert
66
spec:
77
isCA: true
8-
commonName: $(KATIB_SERVICE_NAME).$(KATIB_NAMESPACE).svc
8+
commonName: KATIB_SERVICE_NAME_PLACEHOLDER.KATIB_NAMESPACE_PLACEHOLDER.svc
99
dnsNames:
10-
- $(KATIB_SERVICE_NAME).$(KATIB_NAMESPACE).svc
11-
- $(KATIB_SERVICE_NAME).$(KATIB_NAMESPACE).svc.cluster.local
10+
- KATIB_SERVICE_NAME_PLACEHOLDER.KATIB_NAMESPACE_PLACEHOLDER.svc
11+
- KATIB_SERVICE_NAME_PLACEHOLDER.KATIB_NAMESPACE_PLACEHOLDER.svc.cluster.local
1212
issuerRef:
1313
kind: Issuer
1414
name: katib-selfsigned-issuer

‎apps/katib/upstream/installs/katib-cert-manager/kustomization.yaml‎

Lines changed: 108 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,123 @@ resources:
2222
images:
2323
- name: docker.io/kubeflowkatib/katib-controller
2424
newName: docker.io/kubeflowkatib/katib-controller
25-
newTag: v0.17.0
25+
newTag: latest
2626
- name: docker.io/kubeflowkatib/katib-db-manager
2727
newName: docker.io/kubeflowkatib/katib-db-manager
28-
newTag: v0.17.0
28+
newTag: latest
2929
- name: docker.io/kubeflowkatib/katib-ui
3030
newName: docker.io/kubeflowkatib/katib-ui
31-
newTag: v0.17.0
31+
newTag: latest
3232

33-
patchesStrategicMerge:
34-
- patches/katib-cert-injection.yaml
35-
36-
vars:
37-
- fieldref:
38-
fieldPath: metadata.namespace
39-
name: KATIB_NAMESPACE
40-
objref:
41-
apiVersion: v1
42-
kind: Service
43-
name: katib-controller
44-
- fieldref:
45-
fieldPath: metadata.name
46-
name: KATIB_SERVICE_NAME
47-
objref:
48-
apiVersion: v1
49-
kind: Service
50-
name: katib-controller
51-
- name: KATIB_CERT_NAME
52-
objref:
33+
patches:
34+
- path: patches/katib-cert-injection.yaml
35+
replacements:
36+
- source:
37+
fieldPath: metadata.namespace
38+
kind: Service
39+
name: katib-controller
40+
version: v1
41+
targets:
42+
- fieldPaths:
43+
- spec.commonName
44+
options:
45+
delimiter: .
46+
index: 1
47+
select:
48+
group: cert-manager.io
5349
kind: Certificate
50+
name: katib-webhook-cert
51+
version: v1
52+
- fieldPaths:
53+
- spec.dnsNames.0
54+
options:
55+
delimiter: .
56+
index: 1
57+
select:
5458
group: cert-manager.io
59+
kind: Certificate
60+
name: katib-webhook-cert
5561
version: v1
62+
- fieldPaths:
63+
- spec.dnsNames.1
64+
options:
65+
delimiter: .
66+
index: 1
67+
select:
68+
group: cert-manager.io
69+
kind: Certificate
5670
name: katib-webhook-cert
57-
fieldref:
58-
fieldpath: metadata.name
71+
version: v1
72+
- fieldPaths:
73+
- metadata.annotations.[cert-manager.io/inject-ca-from]
74+
options:
75+
delimiter: /
76+
index: 1
77+
select:
78+
kind: ValidatingWebhookConfiguration
79+
name: katib.kubeflow.org
80+
- fieldPaths:
81+
- metadata.annotations.[cert-manager.io/inject-ca-from]
82+
options:
83+
delimiter: /
84+
index: 1
85+
select:
86+
kind: MutatingWebhookConfiguration
87+
name: katib.kubeflow.org
88+
- source:
89+
fieldPath: metadata.name
90+
kind: Service
91+
name: katib-controller
92+
version: v1
93+
targets:
94+
- fieldPaths:
95+
- spec.commonName
96+
options:
97+
delimiter: .
98+
select:
99+
group: cert-manager.io
100+
kind: Certificate
101+
name: katib-webhook-cert
102+
version: v1
103+
- fieldPaths:
104+
- spec.dnsNames.0
105+
options:
106+
delimiter: .
107+
select:
108+
group: cert-manager.io
109+
kind: Certificate
110+
name: katib-webhook-cert
111+
version: v1
112+
- fieldPaths:
113+
- spec.dnsNames.1
114+
options:
115+
delimiter: .
116+
select:
117+
group: cert-manager.io
118+
kind: Certificate
119+
name: katib-webhook-cert
120+
version: v1
121+
- source:
122+
fieldPath: metadata.name
123+
kind: Certificate
124+
name: katib-webhook-cert
125+
targets:
126+
- fieldPaths:
127+
- metadata.annotations.[cert-manager.io/inject-ca-from]
128+
options:
129+
delimiter: /
130+
index: 1
131+
select:
132+
kind: ValidatingWebhookConfiguration
133+
name: katib.kubeflow.org
134+
- fieldPaths:
135+
- metadata.annotations.[cert-manager.io/inject-ca-from]
136+
options:
137+
delimiter: /
138+
index: 1
139+
select:
140+
kind: MutatingWebhookConfiguration
141+
name: katib.kubeflow.org
59142

60143
configurations:
61144
- params.yaml

‎apps/katib/upstream/installs/katib-cert-manager/patches/katib-cert-injection.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ kind: ValidatingWebhookConfiguration
44
metadata:
55
name: katib.kubeflow.org
66
annotations:
7-
cert-manager.io/inject-ca-from: $(KATIB_NAMESPACE)/$(KATIB_CERT_NAME)
7+
cert-manager.io/inject-ca-from: KATIB_NAMESPACE_PLACEHOLDER/KATIB_CERT_NAME_PLACEHOLDER
88
---
99
apiVersion: admissionregistration.k8s.io/v1
1010
kind: MutatingWebhookConfiguration
1111
metadata:
1212
name: katib.kubeflow.org
1313
annotations:
14-
cert-manager.io/inject-ca-from: $(KATIB_NAMESPACE)/$(KATIB_CERT_NAME)
14+
cert-manager.io/inject-ca-from: KATIB_NAMESPACE_PLACEHOLDER/KATIB_CERT_NAME_PLACEHOLDER

‎apps/katib/upstream/installs/katib-external-db/kustomization.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ images:
2525
- name: docker.io/kubeflowkatib/katib-ui
2626
newName: docker.io/kubeflowkatib/katib-ui
2727
newTag: v0.17.0
28-
patchesStrategicMerge:
29-
- patches/db-manager.yaml
28+
29+
patches:
30+
- path: patches/db-manager.yaml
31+
3032
# Modify katib-mysql-secrets with parameters for the DB.
3133
secretGenerator:
3234
- name: katib-mysql-secrets

‎apps/katib/upstream/installs/katib-with-kubeflow/kustomization.yaml‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ images:
1919
newName: docker.io/kubeflowkatib/katib-ui
2020
newTag: v0.17.0
2121

22-
patchesStrategicMerge:
23-
- patches/remove-namespace.yaml
24-
2522
patches:
23+
- path: patches/remove-namespace.yaml
2624
# Extend RBAC permission list of katib-ui so it can
2725
# create SubjectAccessReview resources.
2826
- target:
@@ -54,14 +52,24 @@ patches:
5452
namespace: kubeflow
5553
path: patches/katib-mysql-service-select-app.yaml
5654

57-
vars:
58-
- fieldref:
59-
fieldPath: metadata.namespace
60-
name: KATIB_UI_NAMESPACE
61-
objref:
62-
apiVersion: apps/v1
63-
kind: Deployment
55+
replacements:
56+
- source:
57+
fieldPath: metadata.namespace
58+
group: apps
59+
kind: Deployment
60+
name: katib-ui
61+
version: v1
62+
targets:
63+
- fieldPaths:
64+
- spec.http.0.route.0.destination.host
65+
options:
66+
delimiter: .
67+
index: 1
68+
select:
69+
group: networking.istio.io
70+
kind: VirtualService
6471
name: katib-ui
72+
version: v1alpha3
6573

6674
configurations:
6775
- params.yaml

‎apps/katib/upstream/installs/katib-with-kubeflow/ui-virtual-service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ spec:
1616
uri: /katib/
1717
route:
1818
- destination:
19-
host: katib-ui.$(KATIB_UI_NAMESPACE).svc.cluster.local
19+
host: katib-ui.KATIB_UI_NAMESPACE_PLACEHOLDER.svc.cluster.local
2020
port:
2121
number: 80

0 commit comments

Comments
 (0)