Skip to content

Commit 58e7de2

Browse files
michaelvlmichaelvl
committed
Update several dependencies
1 parent d822c66 commit 58e7de2

File tree

14 files changed

+10718
-5935
lines changed

14 files changed

+10718
-5935
lines changed

‎Makefile.local‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,34 +43,29 @@ wait-ready-external-dns-test:
4343
until kubectl wait pods -l app.kubernetes.io/instance=external-dns --for condition=Ready --timeout=120s ; do echo "."; sleep 1; done
4444

4545
#################
46-
GATEWAY_API_VERSION ?= v0.7.1
46+
GATEWAY_API_VERSION ?= v1.2.1
4747

4848
.PHONY: gateway-api-upstream-get
4949
gateway-api-upstream-get:
50-
mkdir -p upstream-gateway-api/crds upstream-gateway-api/webhook
51-
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=$(GATEWAY_API_VERSION)" > upstream-gateway-api/crds/crds.yaml
52-
#kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=$(GATEWAY_API_VERSION)" > upstream-gateway-api-crds/crds.yaml
53-
(cd upstream-gateway-api/webhook && for manifestfile in 0-namespace.yaml admission_webhook.yaml certificate_config.yaml; do curl -sL -O https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/$(GATEWAY_API_VERSION)/config/webhook/$$manifestfile; done)
50+
mkdir upstream-gateway-api
51+
curl -sL https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.1/standard-install.yaml > upstream-gateway-api/crds.yaml
5452

5553
.PHONY: deploy-gateway-api
5654
deploy-gateway-api:
57-
kubectl apply -f upstream-gateway-api/crds
58-
kubectl apply -f upstream-gateway-api/webhook
59-
echo "Waiting for gateway-api admission server to be ready"
60-
kubectl -ngateway-system wait --for=condition=Available --timeout=120s deploy gateway-api-admission-server
55+
kubectl apply -f upstream-gateway-api/
6156

6257
#################
6358
.PHONY: create-cluster
6459
create-cluster:
65-
cat test-data/kind-config.yaml_tpl | k8s_ver=1.25.3 envsubst > test-data/kind-config.yaml
60+
cat test-data/kind-config.yaml_tpl | k8s_ver=1.32.0 envsubst > test-data/kind-config.yaml
6661
kind create cluster --name kind-gwc-dev-cluster --config test-data/kind-config.yaml
6762

6863
.PHONY: delete-cluster
6964
delete-cluster:
7065
kind delete cluster --name kind-gwc-dev-cluster
7166

7267
#################
73-
ISTIO_VERSION ?= 1.18.0
68+
ISTIO_VERSION ?= 1.24.2
7469

7570
.PHONY: deploy-istio
7671
deploy-istio:
@@ -89,7 +84,7 @@ cluster-load-controller-image:
8984
#################
9085
.PHONY: deploy-etcd
9186
deploy-etcd:
92-
helm upgrade -i --repo https://charts.bitnami.com/bitnami etcd-test-only etcd --version 8.6.0 --set auth.rbac.create=false
87+
helm upgrade -i --repo https://charts.bitnami.com/bitnami etcd-test-only etcd --version 10.5.1 --set auth.rbac.create=false
9388

9489
#################
9590
.PHONY: deploy-coredns
@@ -130,22 +125,23 @@ deploy-kube-state-metrics:
130125
# https://kind.sigs.k8s.io/docs/user/loadbalancer/
131126
.PHONY: deploy-metallb
132127
deploy-metallb:
133-
kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.13.7/config/manifests/metallb-native.yaml
128+
kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.14.8/config/manifests/metallb-native.yaml
129+
sleep 5
134130
kubectl wait --namespace metallb-system --for=condition=ready pod --selector=app=metallb --timeout=90s
135131
scripts/kind-metallb-configure.sh
136132

137133
#################
138134
.PHONY: deploy-contour
139135
deploy-contour:
140-
helm upgrade -i --repo https://charts.bitnami.com/bitnami contour contour -n projectcontour --version 11.0.0 --create-namespace
136+
helm upgrade -i --repo https://charts.bitnami.com/bitnami contour contour -n projectcontour --version 19.2.0 --create-namespace
141137

142138
# To allow contour to provision from gateway resources
143139
.PHONY: deploy-contour-provisioner
144140
deploy-contour-provisioner:
145-
kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/release-1.24/examples/gateway-provisioner/00-common.yaml
146-
kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/release-1.24/examples/gateway-provisioner/01-roles.yaml
147-
kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/release-1.24/examples/gateway-provisioner/02-rolebindings.yaml
148-
kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/release-1.24/examples/gateway-provisioner/03-gateway-provisioner.yaml
141+
kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/release-1.30/examples/gateway-provisioner/00-common.yaml
142+
kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/release-1.30/examples/gateway-provisioner/01-roles.yaml
143+
kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/release-1.30/examples/gateway-provisioner/02-rolebindings.yaml
144+
kubectl apply -f https://raw.githubusercontent.com/projectcontour/contour/release-1.30/examples/gateway-provisioner/03-gateway-provisioner.yaml
149145
kubectl apply -f test-data/contour-gatewayclass.yaml
150146

151147
#################
@@ -308,7 +304,8 @@ deploy-namespace-gatewayclassconfig:
308304

309305
.PHONY: wait-ready-getting-started-usecase
310306
wait-ready-getting-started-usecase:
311-
scripts/waitfor.sh scripts/curl.sh -s --connect-timeout 1 --fail --resolve foo.example.com:80:127.0.0.1 http://foo.example.com/site
307+
$(eval GATEWAY_IP=$(shell kubectl -n foo-infra get gateway foo-gateway -o jsonpath='{.status.addresses[0].value}'))
308+
scripts/waitfor.sh scripts/curl.sh -s --connect-timeout 1 --fail --resolve foo.example.com:80:$(GATEWAY_IP) http://foo.example.com/site
312309

313310
.PHONY: tryout-getting-started-usecase
314311
tryout-getting-started-usecase:

‎devbox.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.13.6/.schema/devbox.schema.json",
3+
"packages": [
4+
"gnumake@4.4.1",
5+
"kind@0.24.0",
6+
"kubectl@1.25.3",
7+
"kubernetes-helm@3.16.3",
8+
"kustomize@5.5.0"
9+
],
10+
"shell": {
11+
"init_hook": [
12+
"echo 'Welcome to Bifrost gateway controller dev environment'"
13+
],
14+
}
15+
}

‎devbox.lock‎

Lines changed: 287 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,287 @@
1+
{
2+
"lockfile_version": "1",
3+
"packages": {
4+
"gnumake@4.4.1": {
5+
"last_modified": "2024-12-03T12:40:06Z",
6+
"resolved": "github:NixOS/nixpkgs/566e53c2ad750c84f6d31f9ccb9d00f823165550#gnumake",
7+
"source": "devbox-search",
8+
"version": "4.4.1",
9+
"systems": {
10+
"aarch64-darwin": {
11+
"outputs": [
12+
{
13+
"name": "out",
14+
"path": "/nix/store/j2mshll8lvgc21dbmjyfcvlj98z4pl2f-gnumake-4.4.1",
15+
"default": true
16+
},
17+
{
18+
"name": "man",
19+
"path": "/nix/store/xf2ipc0w3wr5ymqai8dm940sw3a7xk69-gnumake-4.4.1-man",
20+
"default": true
21+
},
22+
{
23+
"name": "info",
24+
"path": "/nix/store/1q1mx4697p2366yf45mhrsxm415gmvh8-gnumake-4.4.1-info"
25+
}
26+
],
27+
"store_path": "/nix/store/j2mshll8lvgc21dbmjyfcvlj98z4pl2f-gnumake-4.4.1"
28+
},
29+
"aarch64-linux": {
30+
"outputs": [
31+
{
32+
"name": "out",
33+
"path": "/nix/store/zwyip85vjf7972r2q71vrx9fppv7j816-gnumake-4.4.1",
34+
"default": true
35+
},
36+
{
37+
"name": "man",
38+
"path": "/nix/store/kkpyxq7m54gqpf7z1kjm0fkgp2i748mh-gnumake-4.4.1-man",
39+
"default": true
40+
},
41+
{
42+
"name": "debug",
43+
"path": "/nix/store/djip0r8g0bhyspna7zs1wdx6kl29h8dz-gnumake-4.4.1-debug"
44+
},
45+
{
46+
"name": "info",
47+
"path": "/nix/store/l3k5d0h7b6rffm97rmvrxqsk1ybpk1vc-gnumake-4.4.1-info"
48+
}
49+
],
50+
"store_path": "/nix/store/zwyip85vjf7972r2q71vrx9fppv7j816-gnumake-4.4.1"
51+
},
52+
"x86_64-darwin": {
53+
"outputs": [
54+
{
55+
"name": "out",
56+
"path": "/nix/store/rhra8sm6f4mlxg2p9qwr7cig1zlfwhgq-gnumake-4.4.1",
57+
"default": true
58+
},
59+
{
60+
"name": "man",
61+
"path": "/nix/store/2n5zqv14340b1d71gcvxg22kk6wgm09m-gnumake-4.4.1-man",
62+
"default": true
63+
},
64+
{
65+
"name": "info",
66+
"path": "/nix/store/rxrkjmfi95mzymfclx1szm61p3pygd6k-gnumake-4.4.1-info"
67+
}
68+
],
69+
"store_path": "/nix/store/rhra8sm6f4mlxg2p9qwr7cig1zlfwhgq-gnumake-4.4.1"
70+
},
71+
"x86_64-linux": {
72+
"outputs": [
73+
{
74+
"name": "out",
75+
"path": "/nix/store/zmdi3226094qc355n9ffhp5an9shpp2d-gnumake-4.4.1",
76+
"default": true
77+
},
78+
{
79+
"name": "man",
80+
"path": "/nix/store/a5kmw72gkf1isyq6xakvmrkfsvqs0gcg-gnumake-4.4.1-man",
81+
"default": true
82+
},
83+
{
84+
"name": "debug",
85+
"path": "/nix/store/9q813q8jf9gni01rv1s482mpqh78l806-gnumake-4.4.1-debug"
86+
},
87+
{
88+
"name": "info",
89+
"path": "/nix/store/cpnb2dpvx8ilq1y2h9cpm4zrsyi1gd4a-gnumake-4.4.1-info"
90+
}
91+
],
92+
"store_path": "/nix/store/zmdi3226094qc355n9ffhp5an9shpp2d-gnumake-4.4.1"
93+
}
94+
}
95+
},
96+
"kind@0.24.0": {
97+
"last_modified": "2024-12-03T12:40:06Z",
98+
"resolved": "github:NixOS/nixpkgs/566e53c2ad750c84f6d31f9ccb9d00f823165550#kind",
99+
"source": "devbox-search",
100+
"version": "0.24.0",
101+
"systems": {
102+
"aarch64-darwin": {
103+
"outputs": [
104+
{
105+
"name": "out",
106+
"path": "/nix/store/na5pm2mpclxn6i9mcdnfmbba2gmh2f1y-kind-0.24.0",
107+
"default": true
108+
}
109+
],
110+
"store_path": "/nix/store/na5pm2mpclxn6i9mcdnfmbba2gmh2f1y-kind-0.24.0"
111+
},
112+
"aarch64-linux": {
113+
"outputs": [
114+
{
115+
"name": "out",
116+
"path": "/nix/store/vwkcf7lfvmifzdqly937i10lglfx7mar-kind-0.24.0",
117+
"default": true
118+
}
119+
],
120+
"store_path": "/nix/store/vwkcf7lfvmifzdqly937i10lglfx7mar-kind-0.24.0"
121+
},
122+
"x86_64-darwin": {
123+
"outputs": [
124+
{
125+
"name": "out",
126+
"path": "/nix/store/la82f85krswj9vm03i82llqf8c76kk35-kind-0.24.0",
127+
"default": true
128+
}
129+
],
130+
"store_path": "/nix/store/la82f85krswj9vm03i82llqf8c76kk35-kind-0.24.0"
131+
},
132+
"x86_64-linux": {
133+
"outputs": [
134+
{
135+
"name": "out",
136+
"path": "/nix/store/whc08b6ammwjpfg1lmf84036j9zqb40q-kind-0.24.0",
137+
"default": true
138+
}
139+
],
140+
"store_path": "/nix/store/whc08b6ammwjpfg1lmf84036j9zqb40q-kind-0.24.0"
141+
}
142+
}
143+
},
144+
"kubectl@1.25.3": {
145+
"last_modified": "2022-11-10T13:14:32Z",
146+
"resolved": "github:NixOS/nixpkgs/72d8853228c9758820c39b8659415b6d89279493#kubectl",
147+
"source": "devbox-search",
148+
"version": "1.25.3",
149+
"systems": {
150+
"aarch64-linux": {
151+
"outputs": [
152+
{
153+
"name": "out",
154+
"path": "/nix/store/y0z32h1k75x91yfawn4nkkb17xf7yb4c-kubectl-1.25.3",
155+
"default": true
156+
},
157+
{
158+
"name": "man",
159+
"path": "/nix/store/y0r0c7xr8svngvig4c6p8rvwb9rcyq4f-kubectl-1.25.3-man",
160+
"default": true
161+
},
162+
{
163+
"name": "convert",
164+
"path": "/nix/store/5pgf3flgm2y0q5gn6m8qw5gkpn2mxls6-kubectl-1.25.3-convert"
165+
}
166+
],
167+
"store_path": "/nix/store/y0z32h1k75x91yfawn4nkkb17xf7yb4c-kubectl-1.25.3"
168+
},
169+
"x86_64-linux": {
170+
"outputs": [
171+
{
172+
"name": "out",
173+
"path": "/nix/store/c2s4295wlbfax2njfm60yr80hbnx4mzp-kubectl-1.25.3",
174+
"default": true
175+
},
176+
{
177+
"name": "man",
178+
"path": "/nix/store/7nq9f46pxd0p56i43cz5gk3rq7km0nsk-kubectl-1.25.3-man",
179+
"default": true
180+
},
181+
{
182+
"name": "convert",
183+
"path": "/nix/store/2vnwf48fv0x7kvr42d0wm3kll1agsifc-kubectl-1.25.3-convert"
184+
}
185+
],
186+
"store_path": "/nix/store/c2s4295wlbfax2njfm60yr80hbnx4mzp-kubectl-1.25.3"
187+
}
188+
}
189+
},
190+
"kubernetes-helm@3.16.3": {
191+
"last_modified": "2024-12-03T12:40:06Z",
192+
"resolved": "github:NixOS/nixpkgs/566e53c2ad750c84f6d31f9ccb9d00f823165550#kubernetes-helm",
193+
"source": "devbox-search",
194+
"version": "3.16.3",
195+
"systems": {
196+
"aarch64-darwin": {
197+
"outputs": [
198+
{
199+
"name": "out",
200+
"path": "/nix/store/ppr8wia2hmshknp9yfhr7ivqqigqqq4j-kubernetes-helm-3.16.3",
201+
"default": true
202+
}
203+
],
204+
"store_path": "/nix/store/ppr8wia2hmshknp9yfhr7ivqqigqqq4j-kubernetes-helm-3.16.3"
205+
},
206+
"aarch64-linux": {
207+
"outputs": [
208+
{
209+
"name": "out",
210+
"path": "/nix/store/vsps7v36p9nbx08v8c7x1a36mmknhacy-kubernetes-helm-3.16.3",
211+
"default": true
212+
}
213+
],
214+
"store_path": "/nix/store/vsps7v36p9nbx08v8c7x1a36mmknhacy-kubernetes-helm-3.16.3"
215+
},
216+
"x86_64-darwin": {
217+
"outputs": [
218+
{
219+
"name": "out",
220+
"path": "/nix/store/8xbrzsfv1q0kkranniy99fcszpwmjglr-kubernetes-helm-3.16.3",
221+
"default": true
222+
}
223+
],
224+
"store_path": "/nix/store/8xbrzsfv1q0kkranniy99fcszpwmjglr-kubernetes-helm-3.16.3"
225+
},
226+
"x86_64-linux": {
227+
"outputs": [
228+
{
229+
"name": "out",
230+
"path": "/nix/store/nyrghdw5xi4kiwbsw6vdvnnyra5cy0x7-kubernetes-helm-3.16.3",
231+
"default": true
232+
}
233+
],
234+
"store_path": "/nix/store/nyrghdw5xi4kiwbsw6vdvnnyra5cy0x7-kubernetes-helm-3.16.3"
235+
}
236+
}
237+
},
238+
"kustomize@5.5.0": {
239+
"last_modified": "2024-11-28T07:51:56Z",
240+
"resolved": "github:NixOS/nixpkgs/226216574ada4c3ecefcbbec41f39ce4655f78ef#kustomize",
241+
"source": "devbox-search",
242+
"version": "5.5.0",
243+
"systems": {
244+
"aarch64-darwin": {
245+
"outputs": [
246+
{
247+
"name": "out",
248+
"path": "/nix/store/97pzcar8sbmpd7mj2555iqr54lj3y0xb-kustomize-5.5.0",
249+
"default": true
250+
}
251+
],
252+
"store_path": "/nix/store/97pzcar8sbmpd7mj2555iqr54lj3y0xb-kustomize-5.5.0"
253+
},
254+
"aarch64-linux": {
255+
"outputs": [
256+
{
257+
"name": "out",
258+
"path": "/nix/store/sjvam8hhzbqwg7r2b6m41yds8vjcbyfg-kustomize-5.5.0",
259+
"default": true
260+
}
261+
],
262+
"store_path": "/nix/store/sjvam8hhzbqwg7r2b6m41yds8vjcbyfg-kustomize-5.5.0"
263+
},
264+
"x86_64-darwin": {
265+
"outputs": [
266+
{
267+
"name": "out",
268+
"path": "/nix/store/g2r3q1iw83z5knibpp7lfg1d28ln2gzv-kustomize-5.5.0",
269+
"default": true
270+
}
271+
],
272+
"store_path": "/nix/store/g2r3q1iw83z5knibpp7lfg1d28ln2gzv-kustomize-5.5.0"
273+
},
274+
"x86_64-linux": {
275+
"outputs": [
276+
{
277+
"name": "out",
278+
"path": "/nix/store/gjpp6303g6akd5p29mjdnfgx1hmsygds-kustomize-5.5.0",
279+
"default": true
280+
}
281+
],
282+
"store_path": "/nix/store/gjpp6303g6akd5p29mjdnfgx1hmsygds-kustomize-5.5.0"
283+
}
284+
}
285+
}
286+
}
287+
}

0 commit comments

Comments
 (0)