-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
e733392
commit 5bee9f9
Showing
7 changed files
with
43 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
projects/kubernetes-sigs/cluster-api-provider-vsphere/CHECKSUMS
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| 90ee08ec33317c5641df3e75d0ffb4b5823dad7d879d8d9f4a90e8cc0e7b3945 _output/bin/cluster-api-provider-vsphere/linux-amd64/manager | ||
| 45341c53bb27d04a1f1cd733fa250f7aa80ebca0a8da7de2fb85d4405639c557 _output/bin/cluster-api-provider-vsphere/linux-arm64/manager | ||
| 21ad99fd6424e837145e2b8ecdfcf69c230717983f8b1372d99b85bddddf2317 _output/bin/cluster-api-provider-vsphere/linux-amd64/manager | ||
| d5ce1faace69067557645b930ee1a72195bf1211bb86dd8af454d83983df1172 _output/bin/cluster-api-provider-vsphere/linux-arm64/manager |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| v1.7.0 | ||
| v1.7.4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,14 @@ | ||
| From 428bcd55446d86ac5c737bc0e12b08cdfbb50ae2 Mon Sep 17 00:00:00 2001 | ||
| From 02c21a83629c62c4526fcccf62bfb91865f493bc Mon Sep 17 00:00:00 2001 | ||
| From: Taylor Neyland <[email protected]> | ||
| Date: Tue, 6 Jun 2023 16:56:24 -0500 | ||
| Subject: [PATCH] Add capv support for Bottlerocket | ||
|
|
||
| --- | ||
| pkg/services/govmomi/vcenter/clone.go | 4 ++-- | ||
| .../capi-upgrades/v1alpha3/cluster-template.yaml | 2 ++ | ||
| .../capi-upgrades/v1alpha4/cluster-template.yaml | 2 ++ | ||
| 3 files changed, 6 insertions(+), 2 deletions(-) | ||
| pkg/services/govmomi/vcenter/clone.go | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/pkg/services/govmomi/vcenter/clone.go b/pkg/services/govmomi/vcenter/clone.go | ||
| index 999f9846..09fe9c39 100644 | ||
| index c6d1e1d1..01a4fd86 100644 | ||
| --- a/pkg/services/govmomi/vcenter/clone.go | ||
| +++ b/pkg/services/govmomi/vcenter/clone.go | ||
| @@ -60,10 +60,10 @@ func Clone(ctx *context.VMContext, bootstrapData []byte, format bootstrapv1.Form | ||
|
|
@@ -26,46 +24,6 @@ index 999f9846..09fe9c39 100644 | |
| } | ||
| } | ||
| if ctx.VSphereVM.Spec.CustomVMXKeys != nil { | ||
| diff --git a/test/e2e/data/infrastructure-vsphere/capi-upgrades/v1alpha3/cluster-template.yaml b/test/e2e/data/infrastructure-vsphere/capi-upgrades/v1alpha3/cluster-template.yaml | ||
| index 69fe199b..73fbb0bb 100644 | ||
| --- a/test/e2e/data/infrastructure-vsphere/capi-upgrades/v1alpha3/cluster-template.yaml | ||
| +++ b/test/e2e/data/infrastructure-vsphere/capi-upgrades/v1alpha3/cluster-template.yaml | ||
| @@ -174,6 +174,7 @@ spec: | ||
| - echo "127.0.0.1 {{ ds.meta_data.hostname }}" >>/etc/hosts | ||
| - echo "{{ ds.meta_data.hostname }}" >/etc/hostname | ||
| useExperimentalRetryJoin: true | ||
| + format: '${VSPHERE_TEMPLATE_BOOTSTRAP_FORMAT}' | ||
| users: | ||
| - name: capv | ||
| sshAuthorizedKeys: | ||
| @@ -207,6 +208,7 @@ spec: | ||
| sshAuthorizedKeys: | ||
| - '${VSPHERE_SSH_AUTHORIZED_KEY}' | ||
| sudo: ALL=(ALL) NOPASSWD:ALL | ||
| + format: '${VSPHERE_TEMPLATE_BOOTSTRAP_FORMAT}' | ||
| --- | ||
| apiVersion: cluster.x-k8s.io/v1alpha3 | ||
| kind: MachineDeployment | ||
| diff --git a/test/e2e/data/infrastructure-vsphere/capi-upgrades/v1alpha4/cluster-template.yaml b/test/e2e/data/infrastructure-vsphere/capi-upgrades/v1alpha4/cluster-template.yaml | ||
| index 96ca172b..01394e65 100644 | ||
| --- a/test/e2e/data/infrastructure-vsphere/capi-upgrades/v1alpha4/cluster-template.yaml | ||
| +++ b/test/e2e/data/infrastructure-vsphere/capi-upgrades/v1alpha4/cluster-template.yaml | ||
| @@ -150,6 +150,7 @@ spec: | ||
| - echo "127.0.0.1 {{ ds.meta_data.hostname }}" >>/etc/hosts | ||
| - echo "{{ ds.meta_data.hostname }}" >/etc/hostname | ||
| useExperimentalRetryJoin: true | ||
| + format: '${VSPHERE_TEMPLATE_BOOTSTRAP_FORMAT}' | ||
| users: | ||
| - name: capv | ||
| sshAuthorizedKeys: | ||
| @@ -188,6 +189,7 @@ spec: | ||
| sshAuthorizedKeys: | ||
| - '${VSPHERE_SSH_AUTHORIZED_KEY}' | ||
| sudo: ALL=(ALL) NOPASSWD:ALL | ||
| + format: '${VSPHERE_TEMPLATE_BOOTSTRAP_FORMAT}' | ||
| --- | ||
| apiVersion: cluster.x-k8s.io/v1alpha4 | ||
| kind: MachineDeployment | ||
| -- | ||
| 2.39.2 | ||
| 2.40.1 | ||
|
|
||