Skip to content

Commit 93769cf

Browse files
committed
🎨 Rebrand to Kairos
See: kairos-io/kairos#88
1 parent 7e48467 commit 93769cf

27 files changed

+57
-57
lines changed

.github/workflows/image.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Prepare
1919
id: prep
2020
run: |
21-
DOCKER_IMAGE=quay.io/c3os/osbuilder
21+
DOCKER_IMAGE=quay.io/kairos/osbuilder
2222
VERSION=latest
2323
SHORTREF=${GITHUB_SHA::8}
2424
# If this is git tag, use the tag name as a docker tag

.github/workflows/tool-image.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Prepare
1919
id: prep
2020
run: |
21-
DOCKER_IMAGE=quay.io/c3os/osbuilder-tools
21+
DOCKER_IMAGE=quay.io/kairos/osbuilder-tools
2222
VERSION=latest
2323
SHORTREF=${GITHUB_SHA::8}
2424
# If this is git tag, use the tag name as a docker tag

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
66
VERSION ?= 0.0.1
7-
IMG ?= quay.io/c3os/osbuilder:test
8-
CLUSTER_NAME?="c3os-osbuilder-e2e"
7+
IMG ?= quay.io/kairos/osbuilder:test
8+
CLUSTER_NAME?="kairos-osbuilder-e2e"
99
export ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
1010

1111
# CHANNELS define the bundle channels used in the bundle.
@@ -31,8 +31,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
3131
# This variable is used to construct full image tags for bundle and catalog images.
3232
#
3333
# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
34-
# c3os-x.io/osbuilder-operator-bundle:$VERSION and c3os-x.io/osbuilder-operator-catalog:$VERSION.
35-
IMAGE_TAG_BASE ?= c3os-x.io/osbuilder-operator
34+
# kairos.io/osbuilder-bundle:$VERSION and kairos.io/osbuilder-catalog:$VERSION.
35+
IMAGE_TAG_BASE ?= kairos.io/osbuilder
3636

3737
# BUNDLE_IMG defines the image:tag used for the bundle.
3838
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)

PROJECT

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
domain: c3os-x.io
1+
domain: kairos.io
22
layout:
33
- go.kubebuilder.io/v3
44
plugins:
55
manifests.sdk.operatorframework.io/v2: {}
66
scorecard.sdk.operatorframework.io/v2: {}
77
projectName: osartifactbuilder-operator
8-
repo: github.com/c3os-io/osbuilder-operator
8+
repo: github.com/kairos-io/osbuilder
99
resources:
1010
- api:
1111
crdVersion: v1
1212
namespaced: true
1313
controller: true
14-
domain: c3os-x.io
14+
domain: kairos.io
1515
group: build
1616
kind: OSArtifact
17-
path: github.com/c3os-io/osbuilder-operator/api/v1alpha1
17+
path: github.com/kairos-io/osbuilder/api/v1alpha1
1818
version: v1alpha1
1919
version: "3"

api/v1alpha1/groupversion_info.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ limitations under the License.
1515
*/
1616

1717
// Package v1alpha1 contains API Schema definitions for the build v1alpha1 API group
18-
//+kubebuilder:object:generate=true
19-
//+groupName=build.c3os-x.io
18+
// +kubebuilder:object:generate=true
19+
// +groupName=build.kairos.io
2020
package v1alpha1
2121

2222
import (
@@ -26,7 +26,7 @@ import (
2626

2727
var (
2828
// GroupVersion is group version used to register these objects
29-
GroupVersion = schema.GroupVersion{Group: "build.c3os-x.io", Version: "v1alpha1"}
29+
GroupVersion = schema.GroupVersion{Group: "build.kairos.io", Version: "v1alpha1"}
3030

3131
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
3232
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

config/crd/bases/build.c3os-x.io_osartifacts.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.9.0
77
creationTimestamp: null
8-
name: osartifacts.build.c3os-x.io
8+
name: osartifacts.build.kairos.io
99
spec:
10-
group: build.c3os-x.io
10+
group: build.kairos.io
1111
names:
1212
kind: OSArtifact
1313
listKind: OSArtifactList

config/crd/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# since it depends on service name and namespace that are out of this kustomize package.
33
# It should be run by config/default
44
resources:
5-
- bases/build.c3os-x.io_osartifacts.yaml
5+
- bases/build.kairos.io_osartifacts.yaml
66
#+kubebuilder:scaffold:crdkustomizeresource
77

88
patchesStrategicMerge:

config/crd/patches/cainjection_in_osartifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
7-
name: osartifacts.build.c3os-x.io
7+
name: osartifacts.build.kairos.io

config/crd/patches/webhook_in_osartifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
5-
name: osartifacts.build.c3os-x.io
5+
name: osartifacts.build.kairos.io
66
spec:
77
conversion:
88
strategy: Webhook

config/manager/controller_manager_config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ webhook:
88
port: 9443
99
leaderElection:
1010
leaderElect: true
11-
resourceName: 98ca89ca.c3os-x.io
11+
resourceName: 98ca89ca.kairos.io
1212
# leaderElectionReleaseOnCancel defines if the leader should step down volume
1313
# when the Manager ends. This requires the binary to immediately end when the
1414
# Manager is stopped, otherwise, this setting is unsafe. Setting this significantly

config/manager/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
1212
kind: Kustomization
1313
images:
1414
- name: controller
15-
newName: quay.io/c3os/osbuilder
15+
newName: quay.io/kairos/osbuilder
1616
newTag: test

config/rbac/osartifact_editor_role.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: osartifact-editor-role
66
rules:
77
- apiGroups:
8-
- build.c3os-x.io
8+
- build.kairos.io
99
resources:
1010
- osartifacts
1111
verbs:
@@ -17,7 +17,7 @@ rules:
1717
- update
1818
- watch
1919
- apiGroups:
20-
- build.c3os-x.io
20+
- build.kairos.io
2121
resources:
2222
- osartifacts/status
2323
verbs:

config/rbac/osartifact_viewer_role.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ metadata:
55
name: osartifact-viewer-role
66
rules:
77
- apiGroups:
8-
- build.c3os-x.io
8+
- build.kairos.io
99
resources:
1010
- osartifacts
1111
verbs:
1212
- get
1313
- list
1414
- watch
1515
- apiGroups:
16-
- build.c3os-x.io
16+
- build.kairos.io
1717
resources:
1818
- osartifacts/status
1919
verbs:

config/rbac/role.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: manager-role
77
rules:
88
- apiGroups:
9-
- build.c3os-x.io
9+
- build.kairos.io
1010
resources:
1111
- osartifacts
1212
verbs:
@@ -18,13 +18,13 @@ rules:
1818
- update
1919
- watch
2020
- apiGroups:
21-
- build.c3os-x.io
21+
- build.kairos.io
2222
resources:
2323
- osartifacts/finalizers
2424
verbs:
2525
- update
2626
- apiGroups:
27-
- build.c3os-x.io
27+
- build.kairos.io
2828
resources:
2929
- osartifacts/status
3030
verbs:

config/rbac/role_custom.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: manager-role
77
rules:
88
- apiGroups:
9-
- build.c3os-x.io
9+
- build.kairos.io
1010
resources:
1111
- osartifacts
1212
verbs:
@@ -18,21 +18,21 @@ rules:
1818
- update
1919
- watch
2020
- apiGroups:
21-
- build.c3os-x.io
21+
- build.kairos.io
2222
resources:
2323
- osartifacts/finalizers
2424
verbs:
2525
- update
2626
- apiGroups:
27-
- build.c3os-x.io
27+
- build.kairos.io
2828
resources:
2929
- osartifacts/status
3030
verbs:
3131
- get
3232
- patch
3333
- update
3434
- apiGroups:
35-
- build.c3os-x.io
35+
- build.kairos.io
3636
resources:
3737
- osartifacts/finalizers
3838
verbs:

config/samples/build_v1alpha1_osartifact.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: build.c3os-x.io/v1alpha1
1+
apiVersion: build.kairos.io/v1alpha1
22
kind: OSArtifact
33
metadata:
44
name: osartifact-sample

controllers/configmap.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package controllers
1818

1919
import (
20-
buildv1alpha1 "github.com/c3os-io/osbuilder-operator/api/v1alpha1"
20+
buildv1alpha1 "github.com/kairos-io/osbuilder/api/v1alpha1"
2121
v1 "k8s.io/api/core/v1"
2222

2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

controllers/deployment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package controllers
1919
import (
2020
"fmt"
2121

22-
buildv1alpha1 "github.com/c3os-io/osbuilder-operator/api/v1alpha1"
22+
buildv1alpha1 "github.com/kairos-io/osbuilder/api/v1alpha1"
2323
appsv1 "k8s.io/api/apps/v1"
2424
v1 "k8s.io/api/core/v1"
2525

controllers/osartifact_controller.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"time"
2323

24-
buildv1alpha1 "github.com/c3os-io/osbuilder-operator/api/v1alpha1"
24+
buildv1alpha1 "github.com/kairos-io/osbuilder/api/v1alpha1"
2525
"github.com/pkg/errors"
2626
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -53,9 +53,9 @@ func genOwner(artifact buildv1alpha1.OSArtifact) []metav1.OwnerReference {
5353
}
5454
}
5555

56-
//+kubebuilder:rbac:groups=build.c3os-x.io,resources=osartifacts,verbs=get;list;watch;create;update;patch;delete
57-
//+kubebuilder:rbac:groups=build.c3os-x.io,resources=osartifacts/status,verbs=get;update;patch
58-
//+kubebuilder:rbac:groups=build.c3os-x.io,resources=osartifacts/finalizers,verbs=update
56+
//+kubebuilder:rbac:groups=build.kairos.io,resources=osartifacts,verbs=get;list;watch;create;update;patch;delete
57+
//+kubebuilder:rbac:groups=build.kairos.io,resources=osartifacts/status,verbs=get;update;patch
58+
//+kubebuilder:rbac:groups=build.kairos.io,resources=osartifacts/finalizers,verbs=update
5959

6060
// Reconcile is part of the main kubernetes reconciliation loop which aims to
6161
// move the current state of the cluster closer to the desired state.

controllers/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package controllers
1818

1919
import (
20-
buildv1alpha1 "github.com/c3os-io/osbuilder-operator/api/v1alpha1"
20+
buildv1alpha1 "github.com/kairos-io/osbuilder/api/v1alpha1"
2121
v1 "k8s.io/api/core/v1"
2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323
)

controllers/suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
logf "sigs.k8s.io/controller-runtime/pkg/log"
3131
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3232

33-
buildv1alpha1 "github.com/c3os-io/osbuilder-operator/api/v1alpha1"
33+
buildv1alpha1 "github.com/kairos-io/osbuilder/api/v1alpha1"
3434
//+kubebuilder:scaffold:imports
3535
)
3636

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/c3os-io/osbuilder-operator
1+
module github.com/kairos-io/osbuilder
22

33
go 1.18
44

main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131
"sigs.k8s.io/controller-runtime/pkg/healthz"
3232
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3333

34-
buildv1alpha1 "github.com/c3os-io/osbuilder-operator/api/v1alpha1"
35-
"github.com/c3os-io/osbuilder-operator/controllers"
34+
buildv1alpha1 "github.com/kairos-io/osbuilder/api/v1alpha1"
35+
"github.com/kairos-io/osbuilder/controllers"
3636
//+kubebuilder:scaffold:imports
3737
)
3838

@@ -56,7 +56,7 @@ func main() {
5656
flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
5757
flag.StringVar(&serveImage, "serve-image", "nginx", "Serve image.")
5858
// It needs luet inside
59-
flag.StringVar(&toolImage, "tool-image", "quay.io/c3os/osbuilder-tools:latest", "Tool image.")
59+
flag.StringVar(&toolImage, "tool-image", "quay.io/kairos/osbuilder-tools:latest", "Tool image.")
6060

6161
flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
6262
flag.BoolVar(&enableLeaderElection, "leader-elect", false,
@@ -76,7 +76,7 @@ func main() {
7676
Port: 9443,
7777
HealthProbeBindAddress: probeAddr,
7878
LeaderElection: enableLeaderElection,
79-
LeaderElectionID: "98ca89ca.c3os-x.io",
79+
LeaderElectionID: "98ca89ca.kairos.io",
8080
// LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily
8181
// when the Manager ends. This requires the binary to immediately end when the
8282
// Manager is stopped, otherwise, this setting is unsafe. Setting this significantly

script/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
KUBE_VERSION=${KUBE_VERSION:-v1.22.7}
4-
CLUSTER_NAME="${CLUSTER_NAME:-c3os-osbuilder-e2e}"
4+
CLUSTER_NAME="${CLUSTER_NAME:-kairos-osbuilder-e2e}"
55

66
if ! kind get clusters | grep "$CLUSTER_NAME"; then
77
cat << EOF > kind.config

tests/e2e/e2e_simple_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ var _ = Describe("ISO build test", func() {
1313
Context("registration", func() {
1414

1515
AfterEach(func() {
16-
kubectl.New().Delete("osartifacts", "-n", "default", "hello-c3os")
16+
kubectl.New().Delete("osartifacts", "-n", "default", "hello-kairos")
1717
})
1818

1919
It("creates a simple iso", func() {
2020
err := kubectl.Apply("", "../../tests/fixtures/simple.yaml")
2121
Expect(err).ToNot(HaveOccurred())
2222

2323
Eventually(func() string {
24-
b, _ := kubectl.GetData("default", "osartifacts", "hello-c3os", "jsonpath={.spec.imageName}")
24+
b, _ := kubectl.GetData("default", "osartifacts", "hello-kairos", "jsonpath={.spec.imageName}")
2525
return string(b)
26-
}, 2*time.Minute, 2*time.Second).Should(Equal("quay.io/c3os/c3os:opensuse-latest"))
26+
}, 2*time.Minute, 2*time.Second).Should(Equal("quay.io/kairos/kairos:opensuse-latest"))
2727

2828
Eventually(func() string {
29-
b, _ := kubectl.GetData("default", "deployments", "hello-c3os", "jsonpath={.spec.template.metadata.labels.osbuild}")
29+
b, _ := kubectl.GetData("default", "deployments", "hello-kairos", "jsonpath={.spec.template.metadata.labels.osbuild}")
3030
return string(b)
31-
}, 2*time.Minute, 2*time.Second).Should(Equal("workloadhello-c3os"))
31+
}, 2*time.Minute, 2*time.Second).Should(Equal("workloadhello-kairos"))
3232
Eventually(func() string {
33-
b, _ := kubectl.GetData("default", "deployments", "hello-c3os", "jsonpath={.spec.status.unavailableReplicas}")
33+
b, _ := kubectl.GetData("default", "deployments", "hello-kairos", "jsonpath={.spec.status.unavailableReplicas}")
3434
return string(b)
3535
}, 15*time.Minute, 2*time.Second).ShouldNot(Equal("1"))
3636
})

tests/e2e/e2e_suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ import (
99

1010
func TestE2e(t *testing.T) {
1111
RegisterFailHandler(Fail)
12-
RunSpecs(t, "c3os-operator e2e test Suite")
12+
RunSpecs(t, "kairos-operator e2e test Suite")
1313
}

tests/fixtures/simple.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
apiVersion: build.c3os-x.io/v1alpha1
1+
apiVersion: build.kairos.io/v1alpha1
22
kind: OSArtifact
33
metadata:
4-
name: hello-c3os
4+
name: hello-kairos
55
spec:
6-
imageName: "quay.io/c3os/c3os:opensuse-latest"
6+
imageName: "quay.io/kairos/core-opensuse:latest"
77
iso: true
88
bundles:
9-
- quay.io/c3os/packages:goreleaser-utils-1.11.1
9+
- quay.io/kairos/packages:goreleaser-utils-1.11.1
1010
grubConfig: |
1111
search --file --set=root /boot/kernel.xz
1212
set default=0

0 commit comments

Comments
 (0)