Skip to content

Commit

Permalink
Remove references to osbuilder-tools image
Browse files Browse the repository at this point in the history
because it has been merged with auroraboot here:

kairos-io/AuroraBoot#110

as part of kairos-io/kairos#1633

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
  • Loading branch information
jimmykarily committed Nov 14, 2024
1 parent 3aa1fa1 commit d186dc7
Show file tree
Hide file tree
Showing 30 changed files with 7 additions and 1,225 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jobs:
call-workflow:
uses: kairos-io/linting-composite-action/.github/workflows/reusable-linting.yaml@v0.0.9
with:
yamldirs: ".github/workflows/ config/ tools-image/"
yamldirs: ".github/workflows/ config/"
is-go: true
77 changes: 0 additions & 77 deletions .github/workflows/tool-image.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.22 as builder
FROM golang:1.22 AS builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
25 changes: 0 additions & 25 deletions Earthfile

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ To install, use helm:
# Adds the kairos repo to helm
$ helm repo add kairos https://kairos-io.github.io/helm-charts
"kairos" has been added to your repositories
$ helm repo update
$ helm repo update
Hang tight while we grab the latest from your chart repositories...
...Successfully got an update from the "kairos" chart repository
Update Complete. ⎈Happy Helming!⎈
Expand Down
4 changes: 2 additions & 2 deletions controllers/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (r *OSArtifactReconciler) newArtifactPVC(artifact *osbuilder.OSArtifact) *c

func (r *OSArtifactReconciler) newBuilderPod(pvcName string, artifact *osbuilder.OSArtifact) *corev1.Pod {
cmd := fmt.Sprintf(
"/entrypoint.sh --debug --name %s build-iso --date=false --output /artifacts dir:/rootfs",
"auroraboot --debug build-iso --name %s --date=false --output /artifacts dir:/rootfs",
artifact.Name,
)

Expand Down Expand Up @@ -197,7 +197,7 @@ func (r *OSArtifactReconciler) newBuilderPod(pvcName string, artifact *osbuilder

if artifact.Spec.CloudConfigRef != nil || artifact.Spec.GRUBConfig != "" {
cmd = fmt.Sprintf(
"/entrypoint.sh --debug --name %s build-iso --date=false --overlay-iso /iso/iso-overlay --output /artifacts dir:/rootfs",
"auroraboot --debug build-iso --name %s --date=false --overlay-iso /iso/iso-overlay --output /artifacts dir:/rootfs",
artifact.Name,
)
}
Expand Down
2 changes: 1 addition & 1 deletion controllers/osartifact_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var _ = Describe("OSArtifactReconciler", func() {
Expect(err).ToNot(HaveOccurred())

r = &OSArtifactReconciler{
ToolImage: "quay.io/kairos/osbuilder-tools:latest",
ToolImage: "quay.io/kairos/auroraboot:latest",
}
err = (r).SetupWithManager(mgr)
Expect(err).ToNot(HaveOccurred())
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func main() {
flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")

// It needs luet inside
flag.StringVar(&toolImage, "tool-image", "quay.io/kairos/osbuilder-tools:latest", "Tool image.")
flag.StringVar(&toolImage, "tool-image", "quay.io/kairos/auroraboot:latest", "Tool image.")

flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
flag.BoolVar(&enableLeaderElection, "leader-elect", false,
Expand Down
11 changes: 0 additions & 11 deletions renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,5 @@
"matchUpdateTypes": ["patch"],
"automerge": true
},
],
"regexManagers": [
{
"fileMatch": [
"tools-image/luet-amd64.yaml$",
"tools-image/luet-arm64.yaml$"
],
"matchStrings": [
"#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)?\\s+reference:\\s(?<currentValue>.*?)\\s"
]
}
]
}
108 changes: 0 additions & 108 deletions tools-image/Dockerfile

This file was deleted.

18 changes: 0 additions & 18 deletions tools-image/add-cloud-init.sh

This file was deleted.

13 changes: 0 additions & 13 deletions tools-image/arm/boards/odroid_c2.sh

This file was deleted.

19 changes: 0 additions & 19 deletions tools-image/arm/boards/pinebookpro.sh

This file was deleted.

22 changes: 0 additions & 22 deletions tools-image/arm/boards/rpi3.sh

This file was deleted.

20 changes: 0 additions & 20 deletions tools-image/arm/boards/rpi4.sh

This file was deleted.

Loading

0 comments on commit d186dc7

Please sign in to comment.