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

feat: add custom k3s image #55

Merged
merged 12 commits into from
Mar 26, 2024
Merged

feat: add custom k3s image #55

merged 12 commits into from
Mar 26, 2024

Conversation

mjnagel
Copy link
Contributor

@mjnagel mjnagel commented Mar 25, 2024

Description

This is a (hopefully temporary) addition of a custom k3s image that has a containerd configuration to workaround a zarf init issue.

Related Issue

N/A

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Other (security config, docs update, etc)

Checklist before merging

@mjnagel mjnagel self-assigned this Mar 25, 2024
@mjnagel mjnagel marked this pull request as ready for review March 26, 2024 15:25
@mjnagel mjnagel requested a review from a team as a code owner March 26, 2024 15:25
rjferguson21
rjferguson21 previously approved these changes Mar 26, 2024
rjferguson21
rjferguson21 previously approved these changes Mar 26, 2024
@mjnagel mjnagel merged commit 707f7d5 into main Mar 26, 2024
4 checks passed
@mjnagel mjnagel deleted the k3s-update branch March 26, 2024 17:02
rjferguson21 added a commit to defenseunicorns/uds-core that referenced this pull request Mar 26, 2024
## Description
Takes advantage of custom k3s image to deploy more recent K3s releases.

Relates to defenseunicorns/uds-k3d#55

## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [x] Other (security config, docs update, etc)

## Checklist before merging

- [ ] Test, docs, adr added or updated as needed
- [ ] [Contributor Guide
Steps](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md)(https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md#submitting-a-pull-request)
followed
robmcelvenny pushed a commit to owen-grady/uds-core-slim-dev that referenced this pull request Jun 3, 2024
## Description
Takes advantage of custom k3s image to deploy more recent K3s releases.

Relates to defenseunicorns/uds-k3d#55

## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [x] Other (security config, docs update, etc)

## Checklist before merging

- [ ] Test, docs, adr added or updated as needed
- [ ] [Contributor Guide
Steps](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md)(https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md#submitting-a-pull-request)
followed
rjferguson21 added a commit to defenseunicorns/uds-core that referenced this pull request Jul 11, 2024
## Description
Takes advantage of custom k3s image to deploy more recent K3s releases.

Relates to defenseunicorns/uds-k3d#55

## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [x] Other (security config, docs update, etc)

## Checklist before merging

- [ ] Test, docs, adr added or updated as needed
- [ ] [Contributor Guide
Steps](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md)(https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md#submitting-a-pull-request)
followed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants