Skip to content

Commit bb7f378

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #199 from damdo/rebase-atop-v1.6.2
NO-JIRA: Merge https://github.com/kubernetes-sigs/cluster-api:v1.6.2 (da795db) into master
2 parents 05e357c + 948626b commit bb7f378

File tree

7,780 files changed

+2174853
-3349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,780 files changed

+2174853
-3349
lines changed

‎.golangci.yml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
run:
22
timeout: 10m
3-
go: "1.20"
3+
go: "1.21"
44
build-tags:
55
- tools
66
- e2e
77
skip-files:
88
- "zz_generated.*\\.go$"
99
- "vendored_openapi\\.go$"
10+
# We don't want to invest time to fix new linter findings in old API types.
11+
- "internal/apis/.*"
1012
allow-parallel-runners: true
1113

1214
linters:
@@ -115,26 +117,36 @@ linters-settings:
115117
- pkg: sigs.k8s.io/controller-runtime
116118
alias: ctrl
117119
# CABPK
120+
- pkg: sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha3
121+
alias: bootstrapv1alpha3
118122
- pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4
119123
alias: bootstrapv1alpha4
120124
- pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1
121125
alias: bootstrapv1
122126
# KCP
127+
- pkg: sigs.k8s.io/cluster-api/internal/apis/controlplane/kubeadm/v1alpha3
128+
alias: controlplanev1alpha3
123129
- pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1alpha4
124130
alias: controlplanev1alpha4
125131
- pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1
126132
alias: controlplanev1
127133
# CAPI
134+
- pkg: sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3
135+
alias: clusterv1alpha3
128136
- pkg: sigs.k8s.io/cluster-api/api/v1alpha4
129137
alias: clusterv1alpha4
130138
- pkg: sigs.k8s.io/cluster-api/api/v1beta1
131139
alias: clusterv1
132140
# CAPI exp
141+
- pkg: sigs.k8s.io/cluster-api/internal/apis/core/exp/v1alpha3
142+
alias: expv1alpha3
133143
- pkg: sigs.k8s.io/cluster-api/exp/api/v1alpha4
134144
alias: expv1alpha4
135145
- pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
136146
alias: expv1
137147
# CAPI exp addons
148+
- pkg: sigs.k8s.io/cluster-api/internal/apis/core/exp/addons/v1alpha3
149+
alias: addonsv1alpha3
138150
- pkg: sigs.k8s.io/cluster-api/exp/addons/api/v1alpha4
139151
alias: addonsv1alpha4
140152
- pkg: sigs.k8s.io/cluster-api/exp/addons/api/v1beta1
@@ -158,11 +170,15 @@ linters-settings:
158170
- pkg: sigs.k8s.io/cluster-api/internal/webhooks/runtime
159171
alias: runtimewebhooks
160172
# CAPD
173+
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha3
174+
alias: infrav1alpha3
161175
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1alpha4
162176
alias: infrav1alpha4
163177
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1
164178
alias: infrav1
165179
# CAPD exp
180+
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1alpha3
181+
alias: infraexpv1alpha3
166182
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1alpha4
167183
alias: infraexpv1alpha4
168184
- pkg: sigs.k8s.io/cluster-api/test/infrastructure/docker/exp/api/v1beta1
@@ -226,7 +242,7 @@ issues:
226242
# should be removed as the referenced deprecated types are removed from the project.
227243
- linters:
228244
- staticcheck
229-
text: "SA1019: (clusterv1alpha4.*) is deprecated: This type will be removed in one of the next releases."
245+
text: "SA1019: (clusterv1alpha3.*|clusterv1alpha4.*) is deprecated: This type will be removed in one of the next releases."
230246
- linters:
231247
- revive
232248
text: "exported: exported method .*\\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported"

‎CONTRIBUTING.md‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
- [Proposal process (CAEP)](#proposal-process-caep)
1919
- [Triaging E2E test failures](#triaging-e2e-test-failures)
2020
- [Reviewing a Patch](#reviewing-a-patch)
21-
- [Reviews](#reviews)
21+
- [Reviews](#reviews)
2222
- [Approvals](#approvals)
2323
- [Features and bugs](#features-and-bugs)
2424
- [Experiments](#experiments)
@@ -166,8 +166,9 @@ Cluster API maintains the most recent release/releases for all supported API and
166166

167167
| Minor Release | API Version | Supported Until |
168168
|---------------|--------------|-----------------------------------------------------|
169+
| v1.6.x | **v1beta1** | when v1.8.0 will be released |
169170
| v1.5.x | **v1beta1** | when v1.7.0 will be released |
170-
| v1.4.x | **v1beta1** | when v1.6.0 will be released, tentatively Nov 2023 |
171+
| v1.4.x | **v1beta1** | EOL since 2023-12-05 - v1.6.0 release date |
171172
| v1.3.x | **v1beta1** | EOL since 2023-07-25 - v1.5.0 release date |
172173
| v1.2.x | **v1beta1** | EOL since 2023-03-28 - v1.4.0 release date |
173174
| v1.1.x | **v1beta1** | EOL since 2022-07-18 - v1.2.0 release date (*) |
@@ -249,30 +250,7 @@ When submitting the PR remember to label it with the 📖 (:book:) icon.
249250

250251
## Releases
251252

252-
- Minor versions CAN be planned and scheduled for each quarter, or sooner if necessary.
253-
- Each minor version is preceded with one or more planning session.
254-
- Planning consists of one or more backlog grooming meetings, roadmap amendments,
255-
and CAEP proposal reviews.
256-
- Cluster API uses [GitHub milestones](https://github.com/kubernetes-sigs/cluster-api/milestones) to track work
257-
for minor releases.
258-
- Adding an issue to a milestone provides forward visibility on what the next release will be, so, as soon as there
259-
is the intent to work on an issue for a specific target release, contributors are expected to work with maintainers to
260-
set the milestone on the issue so it will be tracked for the release (note: only major features/bug fixes specifically
261-
targeting a release must be tracked; everything else will simply merge when ready without additional toil).
262-
- Before adding an issue to a release milestone, maintainers must ensure that the issue have been triaged and
263-
there is an assignee who expressed the intent to complete the work before the release date.
264-
- An issue being in the milestone doesn't guarantee inclusion in the release; this depends on the work being
265-
completed before the release code freeze target date.
266-
- Code freeze is in effect at least 72 hours (3 days) before a major/minor release.
267-
- Maintainers should communicate the code freeze date at a community meeting preceding the code freeze date.
268-
- Only critical bug fixes may be merged in between freeze & release.
269-
- Each bug MUST be associated with an open issue and properly triaged.
270-
- PRs MUST be approved by at least 2 project maintainers.
271-
- First approver should `/approve` and `/hold`.
272-
- Second approver should `/approve` and `/hold cancel`.
273-
- [E2E Test grid](https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi%20e2e%20tests) SHOULD be green before cutting a release.
274-
- Patch versions CAN be planned and scheduled each month for supported minor releases.
275-
- Dates in a release are approximations and always subject to change.
253+
Cluster API release process is described in [this document](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/release/release-cycle.md).
276254

277255
## Proposal process (CAEP)
278256

@@ -312,7 +290,7 @@ In case you want to run E2E test locally, please refer to the [Testing](https://
312290

313291
## Reviewing a Patch
314292

315-
## Reviews
293+
### Reviews
316294

317295
> Parts of the following content have been adapted from https://google.github.io/eng-practices/review.
318296

‎Makefile‎

Lines changed: 47 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash
2323
#
2424
# Go.
2525
#
26-
GO_VERSION ?= 1.20.11
26+
GO_VERSION ?= 1.21.5
2727
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
2828

2929
# Use GOPROXY environment variable if set
@@ -39,7 +39,7 @@ export GO111MODULE=on
3939
#
4040
# Kubebuilder.
4141
#
42-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.28.0
42+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.29.0
4343
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
4444
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
4545

@@ -265,7 +265,7 @@ help: # Display this help
265265

266266
##@ generate:
267267

268-
ALL_GENERATE_MODULES = core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure in-memory-infrastructure
268+
ALL_GENERATE_MODULES = core kubeadm-bootstrap kubeadm-control-plane docker-infrastructure in-memory-infrastructure test-extension
269269

270270
.PHONY: generate
271271
generate: ## Run all generate-manifests-*, generate-go-deepcopy-*, generate-go-conversions-* and generate-go-openapi targets
@@ -280,6 +280,7 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.
280280
$(CONTROLLER_GEN) \
281281
paths=./ \
282282
paths=./api/... \
283+
paths=./internal/apis/core/... \
283284
paths=./internal/controllers/... \
284285
paths=./internal/webhooks/... \
285286
paths=./$(EXP_DIR)/api/... \
@@ -311,6 +312,7 @@ generate-manifests-kubeadm-bootstrap: $(CONTROLLER_GEN) ## Generate manifests e.
311312
paths=./bootstrap/kubeadm/api/... \
312313
paths=./bootstrap/kubeadm/internal/controllers/... \
313314
paths=./bootstrap/kubeadm/internal/webhooks/... \
315+
paths=./internal/apis/bootstrap/kubeadm/... \
314316
crd:crdVersions=v1 \
315317
rbac:roleName=manager-role \
316318
output:crd:dir=./bootstrap/kubeadm/config/crd/bases \
@@ -326,6 +328,7 @@ generate-manifests-kubeadm-control-plane: $(CONTROLLER_GEN) ## Generate manifest
326328
paths=./controlplane/kubeadm/api/... \
327329
paths=./controlplane/kubeadm/internal/controllers/... \
328330
paths=./controlplane/kubeadm/internal/webhooks/... \
331+
paths=./internal/apis/controlplane/kubeadm/... \
329332
crd:crdVersions=v1 \
330333
rbac:roleName=manager-role \
331334
output:crd:dir=./controlplane/kubeadm/config/crd/bases \
@@ -365,6 +368,13 @@ generate-manifests-in-memory-infrastructure: $(CONTROLLER_GEN) ## Generate manif
365368
output:webhook:dir=./config/webhook \
366369
webhook
367370

371+
.PHONY: generate-manifests-test-extension
372+
generate-manifests-test-extension: $(CONTROLLER_GEN) ## Generate manifests e.g. RBAC for test-extension provider
373+
cd ./test/extension; $(CONTROLLER_GEN) \
374+
paths=./... \
375+
output:rbac:dir=./config/rbac \
376+
rbac:roleName=manager-role
377+
368378
.PHONY: generate-go-deepcopy
369379
generate-go-deepcopy: ## Run all generate-go-deepcopy-* targets
370380
$(MAKE) $(addprefix generate-go-deepcopy-,$(ALL_GENERATE_MODULES))
@@ -415,6 +425,9 @@ generate-go-deepcopy-in-memory-infrastructure: $(CONTROLLER_GEN) ## Generate dee
415425
paths=./api/... \
416426
paths=./internal/cloud/api/...
417427

428+
.PHONY: generate-go-deepcopy-test-extension
429+
generate-go-deepcopy-test-extension: $(CONTROLLER_GEN) ## Generate deepcopy go code for test-extension
430+
418431
.PHONY: generate-go-conversions
419432
generate-go-conversions: ## Run all generate-go-conversions-* targets
420433
$(MAKE) $(addprefix generate-go-conversions-,$(ALL_GENERATE_MODULES))
@@ -428,19 +441,24 @@ generate-go-conversions-core: ## Run all generate-go-conversions-core-* targets
428441

429442
.PHONY: generate-go-conversions-core-api
430443
generate-go-conversions-core-api: $(CONVERSION_GEN) ## Generate conversions go code for core api
431-
$(MAKE) clean-generated-conversions SRC_DIRS="./api/v1alpha4"
444+
$(MAKE) clean-generated-conversions SRC_DIRS="./internal/apis/core/v1alpha3,./api/v1alpha4"
432445
$(CONVERSION_GEN) \
446+
--input-dirs=./internal/apis/core/v1alpha3 \
433447
--input-dirs=./api/v1alpha4 \
434448
--build-tag=ignore_autogenerated_core \
435449
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
436450
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
437451

438452
.PHONY: generate-go-conversions-core-exp
439453
generate-go-conversions-core-exp: $(CONVERSION_GEN) ## Generate conversions go code for core exp
440-
$(MAKE) clean-generated-conversions SRC_DIRS="./$(EXP_DIR)/api/v1alpha4,./$(EXP_DIR)/addons/api/v1alpha4"
454+
$(MAKE) clean-generated-conversions SRC_DIRS="./internal/apis/core/exp/v1alpha3,./internal/apis/core/exp/addons/v1alpha3,./$(EXP_DIR)/api/v1alpha4,./$(EXP_DIR)/addons/api/v1alpha4"
441455
$(CONVERSION_GEN) \
456+
--input-dirs=./internal/apis/core/exp/v1alpha3 \
442457
--input-dirs=./$(EXP_DIR)/api/v1alpha4 \
458+
--input-dirs=./internal/apis/core/exp/addons/v1alpha3 \
443459
--input-dirs=./$(EXP_DIR)/addons/api/v1alpha4 \
460+
--build-tag=ignore_autogenerated_core_exp \
461+
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \
444462
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
445463
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
446464
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
@@ -450,6 +468,7 @@ generate-go-conversions-core-exp-ipam: $(CONVERSION_GEN) ## Generate conversions
450468
$(MAKE) clean-generated-conversions SRC_DIRS="./$(EXP_DIR)/ipam/api/v1alpha1"
451469
$(CONVERSION_GEN) \
452470
--input-dirs=./$(EXP_DIR)/ipam/api/v1alpha1 \
471+
--build-tag=ignore_autogenerated_core_exp_ipam \
453472
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
454473
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
455474

@@ -459,16 +478,18 @@ generate-go-conversions-core-runtime: $(CONVERSION_GEN) ## Generate conversions
459478
$(CONVERSION_GEN) \
460479
--input-dirs=./internal/runtime/test/v1alpha1 \
461480
--input-dirs=./internal/runtime/test/v1alpha2 \
462-
--build-tag=ignore_autogenerated_runtime \
481+
--build-tag=ignore_autogenerated_core_runtime \
463482
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
464483
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
465484

466485
.PHONY: generate-go-conversions-kubeadm-bootstrap
467486
generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm bootstrap
468-
$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/api"
487+
$(MAKE) clean-generated-conversions SRC_DIRS="./bootstrap/kubeadm/api,./internal/apis/bootstrap/kubeadm"
469488
$(CONVERSION_GEN) \
489+
--input-dirs=./internal/apis/bootstrap/kubeadm/v1alpha3 \
470490
--input-dirs=./bootstrap/kubeadm/api/v1alpha4 \
471491
--build-tag=ignore_autogenerated_kubeadm_bootstrap \
492+
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \
472493
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
473494
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
474495
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
@@ -482,21 +503,27 @@ generate-go-conversions-kubeadm-bootstrap: $(CONVERSION_GEN) ## Generate convers
482503

483504
.PHONY: generate-go-conversions-kubeadm-control-plane
484505
generate-go-conversions-kubeadm-control-plane: $(CONVERSION_GEN) ## Generate conversions go code for kubeadm control plane
485-
$(MAKE) clean-generated-conversions SRC_DIRS="./controlplane/kubeadm/api"
506+
$(MAKE) clean-generated-conversions SRC_DIRS="./controlplane/kubeadm/api,./internal/apis/controlplane/kubeadm"
486507
$(CONVERSION_GEN) \
508+
--input-dirs=./internal/apis/controlplane/kubeadm/v1alpha3 \
487509
--input-dirs=./controlplane/kubeadm/api/v1alpha4 \
488510
--build-tag=ignore_autogenerated_kubeadm_controlplane \
511+
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \
489512
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
513+
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha3 \
490514
--extra-peer-dirs=sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha4 \
491515
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
492516
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
493517

494518
.PHONY: generate-go-conversions-docker-infrastructure
495519
generate-go-conversions-docker-infrastructure: $(CONVERSION_GEN) ## Generate conversions go code for docker infrastructure provider
496520
cd $(CAPD_DIR); $(CONVERSION_GEN) \
521+
--input-dirs=./api/v1alpha3 \
497522
--input-dirs=./api/v1alpha4 \
523+
--input-dirs=./$(EXP_DIR)/api/v1alpha3 \
498524
--input-dirs=./$(EXP_DIR)/api/v1alpha4 \
499525
--build-tag=ignore_autogenerated_capd \
526+
--extra-peer-dirs=sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3 \
500527
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1alpha4 \
501528
--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE_CAPD) \
502529
--go-header-file=../../../hack/boilerplate/boilerplate.generatego.txt
@@ -505,6 +532,9 @@ generate-go-conversions-docker-infrastructure: $(CONVERSION_GEN) ## Generate con
505532
generate-go-conversions-in-memory-infrastructure: $(CONVERSION_GEN) ## Generate conversions go code for in-memory infrastructure provider
506533
cd $(CAPIM_DIR)
507534

535+
.PHONY: generate-go-conversions-test-extension
536+
generate-go-conversions-test-extension: $(CONVERSION_GEN) ## Generate conversions go code for in-memory infrastructure provider
537+
508538
# The tmp/sigs.k8s.io/cluster-api symlink is a workaround to make this target run outside of GOPATH
509539
.PHONY: generate-go-openapi
510540
generate-go-openapi: $(OPENAPI_GEN) $(CONTROLLER_GEN) ## Generate openapi go code for runtime SDK
@@ -531,11 +561,19 @@ generate-doctoc:
531561
TRACE=$(TRACE) ./hack/generate-doctoc.sh
532562

533563
.PHONY: generate-e2e-templates
534-
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v1.0 v1.4 v1.5 main) ## Generate cluster templates for all versions
564+
generate-e2e-templates: $(KUSTOMIZE) $(addprefix generate-e2e-templates-, v0.3 v0.4 v1.0 v1.4 v1.5 main) ## Generate cluster templates for all versions
535565

536566
DOCKER_TEMPLATES := test/e2e/data/infrastructure-docker
537567
INMEMORY_TEMPLATES := test/e2e/data/infrastructure-inmemory
538568

569+
.PHONY: generate-e2e-templates-v0.3
570+
generate-e2e-templates-v0.3: $(KUSTOMIZE)
571+
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v0.3/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v0.3/cluster-template.yaml
572+
573+
.PHONY: generate-e2e-templates-v0.4
574+
generate-e2e-templates-v0.4: $(KUSTOMIZE)
575+
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v0.4/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v0.4/cluster-template.yaml
576+
539577
.PHONY: generate-e2e-templates-v1.0
540578
generate-e2e-templates-v1.0: $(KUSTOMIZE)
541579
$(KUSTOMIZE) build $(DOCKER_TEMPLATES)/v1.0/cluster-template --load-restrictor LoadRestrictionsNone > $(DOCKER_TEMPLATES)/v1.0/cluster-template.yaml

‎Tiltfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
envsubst_cmd = "./hack/tools/bin/envsubst"
44
clusterctl_cmd = "./bin/clusterctl"
55
kubectl_cmd = "kubectl"
6-
kubernetes_version = "v1.28.0"
6+
kubernetes_version = "v1.29.0"
77

88
load("ext://uibutton", "cmd_button", "location", "text_input")
99

@@ -184,9 +184,9 @@ def load_provider_tiltfiles():
184184

185185
tilt_helper_dockerfile_header = """
186186
# Tilt image
187-
FROM golang:1.20.11 as tilt-helper
187+
FROM golang:1.21.5 as tilt-helper
188188
# Install delve. Note this should be kept in step with the Go release minor version.
189-
RUN go install github.com/go-delve/delve/cmd/dlv@v1.20
189+
RUN go install github.com/go-delve/delve/cmd/dlv@v1.21
190190
# Support live reloading with Tilt
191191
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/restart.sh && \
192192
wget --output-document /start.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/start.sh && \
@@ -195,7 +195,7 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com
195195
"""
196196

197197
tilt_dockerfile_header = """
198-
FROM golang:1.20.11 as tilt
198+
FROM golang:1.21.5 as tilt
199199
WORKDIR /
200200
COPY --from=tilt-helper /process.txt .
201201
COPY --from=tilt-helper /start.sh .

0 commit comments

Comments
 (0)