Skip to content

Commit 9ecceed

Browse files
committed
refactor: remove invalid patch
Signed-off-by: Tarun Gupta Akirala <tarun.akirala@nutanix.com>
1 parent 0f841b0 commit 9ecceed

File tree

3 files changed

+99
-30
lines changed

3 files changed

+99
-30
lines changed
Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,10 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4+
- ./pre-install
45
- ./helmreleases
56
- ../../../helm-repositories/ntnx-charts
67
- ../../../helm-repositories/kserve-crd
78
- ../../../helm-repositories/kserve
89
- nai-self-signed-cert.yaml
910
- nai-ui-dashboard-cm.yaml
10-
11-
patches:
12-
- patch: |-
13-
- op: replace
14-
path: /spec/servers
15-
value: |-
16-
- hosts:
17-
- '*'
18-
port:
19-
name: http
20-
number: 80
21-
protocol: HTTP
22-
# Upgrade HTTP to HTTPS
23-
tls:
24-
httpsRedirect: true
25-
- hosts:
26-
- '*'
27-
port:
28-
name: https
29-
number: 443
30-
protocol: HTTPS
31-
tls:
32-
mode: SIMPLE
33-
credentialName: nai-self-signed-cert
34-
target:
35-
group: networking.istio.io
36-
version: v1
37-
kind: Gateway
38-
name: knative-ingress-gateway
39-
namespace: knative-serving
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
name: nai-prereq-job
5+
namespace: ${releaseNamespace}
6+
---
7+
apiVersion: rbac.authorization.k8s.io/v1
8+
kind: Role
9+
metadata:
10+
name: nai-prereq-job
11+
namespace: ${releaseNamespace}
12+
rules:
13+
- apiGroups: ["networking.istio.io/v1"]
14+
resources: ["gateways"]
15+
verbs: ["get", "watch", "list", "patch"]
16+
---
17+
apiVersion: rbac.authorization.k8s.io/v1
18+
kind: RoleBinding
19+
metadata:
20+
name: nai-prereq-job
21+
namespace: ${releaseNamespace}
22+
roleRef:
23+
apiGroup: rbac.authorization.k8s.io
24+
kind: Role
25+
name: nai-prereq-job
26+
subjects:
27+
- kind: ServiceAccount
28+
name: nai-prereq-job
29+
namespace: ${releaseNamespace}
30+
---
31+
apiVersion: batch/v1
32+
kind: Job
33+
metadata:
34+
name: nai-prereq-job
35+
namespace: ${releaseNamespace}
36+
spec:
37+
template:
38+
metadata:
39+
name: nai-prereq-job
40+
spec:
41+
serviceAccountName: nai-prereq-job
42+
priorityClassName: system-cluster-critical
43+
restartPolicy: OnFailure
44+
containers:
45+
- name: pre-install
46+
image: "${kubetoolsImageRepository:=bitnami/kubectl}:${kubetoolsImageTag:=1.30.5}"
47+
env:
48+
- name: KNATIVE_INGRESS_GATEWAY_PATCH
49+
value: |
50+
{
51+
"spec": {
52+
"selector": {
53+
"istio": "ingressgateway"
54+
},
55+
"servers": [
56+
{
57+
"hosts": ["*"],
58+
"port": {
59+
"name": "http",
60+
"number": 80,
61+
"protocol": "HTTP"
62+
},
63+
"tls": {
64+
"httpsRedirect": true
65+
}
66+
},
67+
{
68+
"hosts": ["*"],
69+
"port": {
70+
"name": "https",
71+
"number": 443,
72+
"protocol": "HTTPS"
73+
},
74+
"tls": {
75+
"credentialName": "nai-self-signed-cert",
76+
"mode": "SIMPLE"
77+
}
78+
}
79+
]
80+
}
81+
}
82+
command:
83+
- sh
84+
- -c
85+
- |
86+
while ! kubectl wait --for condition=established --timeout=30s crd/gateways.networking.istio.io ;
87+
do
88+
echo "Waiting for gateways.networking.istio.io CRD to be established"
89+
sleep 30
90+
done
91+
echo "Patching knative-ingress-gateway"
92+
kubectl patch gateways.networking.istio.io knative-ingress-gateway -n knative-serving --type='merge' --patch ${KNATIVE_INGRESS_GATEWAY_PATCH}
93+
echo "TODO: kubectl patch cm nai-ui after waiting for the external IP or FQDN of the istio-ingressgateway service"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- job.yaml
5+

0 commit comments

Comments
 (0)