Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore/kube vip upgrade #889

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
32a897a
chore: add .devcontainer
boulc May 8, 2024
c25e90f
chore: add docker support in devcontainer
boulc May 9, 2024
78cb86a
feat: add support for ubunu 22.04
boulc May 9, 2024
d06e954
tests: add support for ubunu 22.04
boulc May 9, 2024
9a446eb
chore: change github and registry references
boulc May 9, 2024
d9d99ab
refactor: review registry
boulc May 10, 2024
c87fc9d
feat: add support for ubuntu 22.04
boulc May 11, 2024
4b6d730
feat: add support for ubuntu 22.04
boulc May 12, 2024
f717c5e
feat: add support for ubuntu 22.04
boulc May 12, 2024
f72bb0f
fix: typo in imgpkg url
boulc May 13, 2024
5131210
ci: automate image publishing
boulc May 13, 2024
8877a67
fix: bundle path issue with semi-colon
boulc May 13, 2024
855f48e
chore: fix various issues (#4)
boulc May 13, 2024
c6c5d64
fix: typo in imgpkg url (#6)
boulc May 13, 2024
9698b3c
fix: relative path issue
boulc May 13, 2024
a86477f
feat: add support for ubuntu 22.04
boulc May 13, 2024
1ec2389
fix: config path
boulc May 13, 2024
6616c45
fix: relative path issue
boulc May 13, 2024
7d7ae82
feat: override bundle registry with environment variable (#7)
boulc May 14, 2024
52beb3d
fix: config path
boulc May 14, 2024
98e1c24
fix: config path
boulc May 15, 2024
38355b3
fix: config path
boulc May 15, 2024
923b240
fix: paths
boulc May 15, 2024
ffb2c54
fix: paths
boulc May 15, 2024
41abc3a
feat: override bundle registry with environment variable
boulc May 15, 2024
98e6d70
docs: fix url
boulc May 15, 2024
b5d3171
fix: missing untar
boulc May 15, 2024
5fac4c9
fix: missing bundle
boulc May 15, 2024
fa2bd1d
chore: add unix scheme to cri socket url
boulc May 18, 2024
6f9e4d9
feat: configure containerd
boulc May 18, 2024
61391b4
feat: enable kubelet service before running kubeadm
boulc May 18, 2024
9880f42
feat: review bundling scripts
boulc May 18, 2024
58dc40f
feat: review script, no more deb
boulc May 23, 2024
7ac9c3a
feat: review script, no more deb
boulc May 23, 2024
7d4d3cc
chore: remove prefix letter v
boulc May 23, 2024
fed8e54
chore: enforce confirmation
boulc May 23, 2024
f20e0fd
chore: uninstall dependencies
boulc May 23, 2024
f9d9525
chore: review containerd installation steps
boulc May 23, 2024
2235bfe
chore: tweak restart of containerd
boulc May 23, 2024
163ebd9
chore(deps): upgrade kube-vip to v0.8.0
boulc May 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/go
{
"name": "Go",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/go:1-1.22-bookworm",
"features": {
"ghcr.io/devcontainers/features/git:1": {},
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {},
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
}

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "go version",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@


version: 2
updates:
- package-ecosystem: gomod
directory: /
schedule:
interval: weekly
- package-ecosystem: "devcontainers"
directory: "/"
schedule:
interval: weekly
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ on:
- 'PROJECT'
- 'SECURITY_CONTACTS'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build-agent:
runs-on: ubuntu-20.04
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/docs-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
paths:
- '**.md'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
markdown-link-check:
name: Broken Links
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/draft-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ jobs:
go-version: 1.20.7

- name: Build Release Artifacts
run: IMG="projects.registry.vmware.com/cluster_api_provider_bringyourownhost/cluster-api-byoh-controller:${{ github.ref_name }}" make build-release-artifacts
run: |
IMG="docker.io/thegnoucommunity/cluster-api-byoh-controller:${{ github.ref_name }}" make build-release-artifacts
IMG="docker.io/thegnoucommunity/cluster-api-byoh-controller:${{ github.ref_name }}" make docker-build
docker login docker.io -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
docker push docker.io/thegnoucommunity/cluster-api-byoh-controller:${{ github.ref_name }}

- name: Publish Release
uses: softprops/action-gh-release@v1
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ on:
- 'PROJECT'
- 'SECURITY_CONTACTS'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
e2e-pr-blocking:
runs-on: ubuntu-20.04
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ on:
- 'PROJECT'
- 'SECURITY_CONTACTS'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
golangci:
runs-on: ubuntu-20.04
Expand All @@ -24,7 +28,6 @@ jobs:
uses: actions/checkout@v3

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v6
with:
version: v1.51.0
skip-go-installation: true
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ _artifacts

# macOS Desktop Service Store files
.DS_Store

# bundles
byoh-ingredients-download
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ linters-settings:
gocyclo:
min-complexity: 15
goimports:
local-prefixes: github.com/vmware-tanzu
local-prefixes: github.com/thegnoucommunity
gomnd:
settings:
mnd:
Expand Down
2 changes: 1 addition & 1 deletion ADOPTERS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## Adding your organization to the list of Bring Your Own Host Provider Adopters

If you are using BYOH and would like to be included in the list of `BYOH Adopters`, add an SVG version of your logo to the `static/img/adopters` directory in this repo and submit a [pull request](https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/pulls) with your change. Name the image file something that reflects your company (e.g., if your company is called Acme, name the image acme.png).
If you are using BYOH and would like to be included in the list of `BYOH Adopters`, add an SVG version of your logo to the `static/img/adopters` directory in this repo and submit a [pull request](https://github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/pulls) with your change. Name the image file something that reflects your company (e.g., if your company is called Acme, name the image acme.png).
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## As a Contributor
### Fork and branch
Local development has to be done in the forked repo of [cluster-api-provider-bringyourownhost](https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost). Here are some examples of meaningful branch names
Local development has to be done in the forked repo of [cluster-api-provider-bringyourownhost](https://github.com/thegnoucommunity/cluster-api-provider-bringyourownhost). Here are some examples of meaningful branch names
* add-host-reservation-logic
* update-readme
* fix-byomachine-controller-flakes
Expand All @@ -25,7 +25,7 @@ At the minimum,
* write (at least) another couple of lines explaining why the commit is necessary or what is the reasoning behind certain code logic

### Raising a PR
* all PRs should be raised against the main branch of [cluster-api-provider-bringyourownhost](https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost)
* all PRs should be raised against the main branch of [cluster-api-provider-bringyourownhost](https://github.com/thegnoucommunity/cluster-api-provider-bringyourownhost)
* all code changes should be accompanied with corresponding unit / integration tests (if for some reason, the code is not unit / integration testable, add enough justification in the PR. Although, this almost should never be the case.)
* all the commits made in the PR should be squashed into one single commit before the final merge by the PR author themselves such that it would be easier to track the commits in Git history.

Expand Down
16 changes: 8 additions & 8 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ layout:
- go.kubebuilder.io/v3
multigroup: true
projectName: byoh
repo: github.com/vmware-tanzu/cluster-api-provider-bringyourownhost
repo: github.com/thegnoucommunity/cluster-api-provider-bringyourownhost
resources:
- api:
crdVersion: v1
namespaced: true
domain: cluster.x-k8s.io
group: infrastructure
kind: ByoMachine
path: github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
path: github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
version: v1beta1
- api:
crdVersion: v1
namespaced: true
domain: cluster.x-k8s.io
group: infrastructure
kind: ByoHost
path: github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
path: github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
version: v1beta1
webhooks:
validation: true
Expand All @@ -30,7 +30,7 @@ resources:
domain: cluster.x-k8s.io
group: infrastructure
kind: ByoCluster
path: github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
path: github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
version: v1beta1
webhooks:
defaulting: true
Expand All @@ -42,7 +42,7 @@ resources:
domain: cluster.x-k8s.io
group: infrastructure
kind: ByoMachineTemplate
path: github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
path: github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
version: v1beta1
- api:
crdVersion: v1
Expand All @@ -51,15 +51,15 @@ resources:
domain: cluster.x-k8s.io
group: infrastructure
kind: K8sInstallerConfig
path: github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
path: github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
version: v1beta1
- api:
crdVersion: v1
namespaced: true
domain: cluster.x-k8s.io
group: infrastructure
kind: K8sInstallerConfigTemplate
path: github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
path: github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
version: v1beta1
- api:
crdVersion: v1
Expand All @@ -68,7 +68,7 @@ resources:
domain: cluster.x-k8s.io
group: infrastructure
kind: BootstrapKubeconfig
path: github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
path: github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/apis/infrastructure/v1beta1
version: v1beta1
webhooks:
validation: true
Expand Down
45 changes: 26 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# Kubernetes Cluster API Provider Bring Your Own Host (BYOH)

<p align="center">
<!-- lint card --><a href="https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/actions/workflows/lint.yml">
<img src="https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/actions/workflows/lint.yml/badge.svg"></a>
<!-- lint card --><a href="https://github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/actions/workflows/lint.yml">
<img src="https://github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/actions/workflows/lint.yml/badge.svg"></a>
<!-- test status -->
<a href="https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/actions?query=event%3Apush+branch%3Amain+workflow%3ACI+">
<img src="https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/actions/workflows/ci.yml/badge.svg?branch=main&event=push"></a>
<a href="https://github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/actions?query=event%3Apush+branch%3Amain+workflow%3ACI+">
<img src="https://github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/actions/workflows/ci.yml/badge.svg?branch=main&event=push"></a>
<!-- go doc / reference card -->
<a href="https://pkg.go.dev/github.com/vmware-tanzu/cluster-api-provider-bringyourownhost">
<img src="https://pkg.go.dev/badge/github.com/vmware-tanzu/cluster-api-provider-bringyourownhost.svg"></a>
<a href="https://pkg.go.dev/github.com/thegnoucommunity/cluster-api-provider-bringyourownhost">
<img src="https://pkg.go.dev/badge/github.com/thegnoucommunity/cluster-api-provider-bringyourownhost.svg"></a>
<!-- goreportcard badge -->
<a href="https://goreportcard.com/report/github.com/vmware-tanzu/cluster-api-provider-bringyourownhost">
<img src="https://goreportcard.com/badge/github.com/vmware-tanzu/cluster-api-provider-bringyourownhost"></a>
<a href="https://goreportcard.com/report/github.com/thegnoucommunity/cluster-api-provider-bringyourownhost">
<img src="https://goreportcard.com/badge/github.com/thegnoucommunity/cluster-api-provider-bringyourownhost"></a>
<!-- codecov badge -->
<a href="https://codecov.io/gh/vmware-tanzu/cluster-api-provider-bringyourownhost">
<img src="https://codecov.io/gh/vmware-tanzu/cluster-api-provider-bringyourownhost/branch/main/graph/badge.svg?token=8GGPY0MENQ"></a>
<a href="https://codecov.io/gh/thegnoucommunity/cluster-api-provider-bringyourownhost">
<img src="https://codecov.io/gh/thegnoucommunity/cluster-api-provider-bringyourownhost/branch/main/graph/badge.svg?token=8GGPY0MENQ"></a>
<!-- openssf badge -->
<a href="https://bestpractices.coreinfrastructure.org/projects/5506">
<img src="https://bestpractices.coreinfrastructure.org/projects/5506/badge"></a>
Expand All @@ -30,6 +31,7 @@ management.
__BYOH__ is a Cluster API Infrastructure Provider for already-provisioned hosts running Linux. This provider allows operators to adopt Cluster API for deploying and managing kubernetes nodes without also having to adopt a specific infrastructure service. This enables users to decouple kubernetes node provisioning from host and infrastructure provisioning.

## BYOH Glossary

**Host** - A host is a running computer system. It could be physical or virtual. It has a kernel and some base operating system

**BYO Host** - A Linux host provisioned and managed outside of Cluster API
Expand All @@ -44,10 +46,11 @@ __BYOH__ is a Cluster API Infrastructure Provider for already-provisioned hosts

- Native Kubernetes manifests and API
- Support for single and multi-node control plane clusters
- Support already provisioned Linux VMs with Ubuntu 20.04
- Support already provisioned Linux VMs with Ubuntu 20.04 or 22.04

## Getting Started
Check out the [getting_started](https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/blob/main/docs/getting_started.md) guide for launching a BYOH workload cluster

Check out the [getting started](https://github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/blob/main/docs/getting_started.md) guide for launching a BYOH workload cluster.

## Community, discussion, contribution, and support

Expand All @@ -57,19 +60,19 @@ If you have questions or want to get the latest project news, you can connect wi
- Chat with us on the Kubernetes [Slack](http://slack.k8s.io/) in the [#cluster-api](https://kubernetes.slack.com/archives/C8TSNPY4T) channel
- Subscribe to the [SIG Cluster Lifecycle](https://groups.google.com/forum/#!forum/kubernetes-sig-cluster-lifecycle) Google Group for access to documents and calendars
- Join our Cluster API Provider for BringYourOwnHost working group sessions where we share the latest project news, demos, answer questions, and triage issues
- Weekly on Wednesdays @ 1:30PM Indian Standard Time on [Zoom](https://VMware.zoom.us/j/94476574480?pwd=WGYzOXBoL1VsVnBXK3c5TWd1bG5SZz09) - [convert to your timezone](https://dateful.com/time-zone-converter?t=13:30&tz=IST)
- Weekly on Wednesdays @ 1:30PM Indian Standard Time on [Zoom](https://VMware.zoom.us/j/94476574480?pwd=WGYzOXBoL1VsVnBXK3c5TWd1bG5SZz09) - [Convert to your timezone](https://dateful.com/time-zone-converter?t=13:30&tz=IST)
- Previous meetings: \[ [notes](https://docs.google.com/document/d/1T-3_eskC_HCtXLh3PA8y--mgO-AIajZfevcnYuno6JM/edit#heading=h.y186zgz0eh6e) | [recordings](https://www.youtube.com/playlist?list=PLHbHoGHbooH41L5P-tIK6QqhILdEI9yBK) \]

Pull Requests and feedback on issues are very welcome!
See the [issue tracker](https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/issues) if you're unsure where to start, especially the [Good first issue](https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) and [Help wanted](https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) tags, and
See the [issue tracker](https://github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/issues) if you're unsure where to start, especially the [Good first issue](https://github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) and [Help wanted](https://github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) tags, and
also feel free to reach out to discuss.

See also our [contributor guide](CONTRIBUTING.md) and the Kubernetes [community page](https://kubernetes.io/community) for more details on how to get involved.


## Project Status

This project is currently a work-in-progress, in an Alpha state, so it may not be production ready. There is no backwards-compatibility guarantee at this point. For more details on the roadmap and upcoming features, check out the project's [issue](https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/issues) tracker on GitHub.
This project is currently a work-in-progress, in an Alpha state, so it may not be production ready. There is no backwards-compatibility guarantee at this point. For more details on the roadmap and upcoming features, check out the project's [issue](https://github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/issues) tracker on GitHub.


## Getting involved and contributing
Expand All @@ -81,6 +84,7 @@ Check out the [developer guide](./docs/local_dev.md) for launching a BYOH cluste
More about development and contributing practices can be found in [`CONTRIBUTING.md`](./CONTRIBUTING.md).

## Implement Custom Installer controller

An installer controller is responsible to provide the installation and uninstallation scripts for k8s dependencies, prerequisites and components on each `BYOHost`.
If someone wants to implement their own installer controller then they need to follow the contract defined in [installer](./docs/installer.md) doc.

Expand All @@ -91,9 +95,11 @@ If someone wants to implement their own installer controller then they need to f
- BYOH is currently compatible wth Cluster API v1beta1 (v1.0)

## Supported OS and Kubernetes versions
| Operating System | Architecture | Kubernetes v1.24.* | Kubernetes v1.25.* | Kubernetes v1.26.* |
| ------------------|---------------|:------------------:|:------------------:|:------------------:|
| Ubuntu 20.04.* | amd64 | ✓ | ✓ | ✓ |

| Operating System | Architecture | Kubernetes v1.24.* | Kubernetes v1.25.* | Kubernetes v1.26.* | Kubernetes v1.29.* |
| ------------------|---------------|:------------------:|:------------------:|:------------------:|:------------------:|
| Ubuntu 20.04.* | amd64 | ✓ | ✓ | ✓ | |
| Ubuntu 22.04.* | amd64 | | | | ✓ |

**NOTE:** The '*' in OS means that all Ubuntu 20.04 patches are supported.

Expand All @@ -102,5 +108,6 @@ If someone wants to implement their own installer controller then they need to f
## BYOH in News
- [TGIK episode on BYOH](https://www.youtube.com/watch?v=Xwm5Ka27-Io&t=2838s)
- BYOH presented during [Cluster API Office Hours](https://www.youtube.com/watch?v=6ODMLgX-dz4&t=572s)
<!-- markdown-link-check-disable -->
- [BYOH on ARM](https://williamlam.com/2021/11/hybrid-x86-and-arm-kubernetes-clusters-using-tanzu-community-edition-tce-and-esxi-arm.html)

<!-- markdown-link-check-enable -->
8 changes: 4 additions & 4 deletions agent/cloudinit/cloudinit.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"

"github.com/pkg/errors"
"github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/common"
"github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/common"
"sigs.k8s.io/yaml"
)

Expand All @@ -38,9 +38,9 @@ type Files struct {
}

// Execute performs the following operations on the bootstrap script
// - parse the script to get the cloudinit data
// - execute the write_files directive
// - execute the run_cmd directive
// - parse the script to get the cloudinit data
// - execute the write_files directive
// - execute the run_cmd directive
func (se ScriptExecutor) Execute(bootstrapScript string) error {
cloudInitData := bootstrapConfig{}
if err := yaml.Unmarshal([]byte(bootstrapScript), &cloudInitData); err != nil {
Expand Down
6 changes: 3 additions & 3 deletions agent/cloudinit/cloudinit_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/agent/cloudinit"
"github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/agent/registration"
"github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/common"
"github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/agent/cloudinit"
"github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/agent/registration"
"github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/common"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions agent/cloudinit/cloudinit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/agent/cloudinit"
"github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/agent/cloudinit/cloudinitfakes"
"github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/agent/cloudinit"
"github.com/thegnoucommunity/cluster-api-provider-bringyourownhost/agent/cloudinit/cloudinitfakes"
)

var _ = Describe("Cloudinit", func() {
Expand Down
Loading
Loading