Skip to content

Commit 161bb51

Browse files
qbarrandqbarrand
committed
Move the Module API to v1alpha1. (#29)
1 parent 1593704 commit 161bb51

38 files changed

+157
-161
lines changed

‎PROJECT

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ resources:
1414
domain: sigs.k8s.io
1515
group: ooto
1616
kind: Module
17-
path: github.com/qbarrand/oot-operator/api/v1beta1
18-
version: v1beta1
17+
path: github.com/qbarrand/oot-operator/api/v1alpha1
18+
version: v1alpha1
1919
version: "3"

‎api/v1beta1/groupversion_info.go renamed to ‎api/v1alpha1/groupversion_info.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// Package v1beta1 contains API Schema definitions for the ooto v1beta1 API group
17+
// Package v1alpha1 contains API Schema definitions for the ooto v1alpha1 API group
1818
//+kubebuilder:object:generate=true
1919
//+groupName=ooto.sigs.k8s.io
20-
package v1beta1
20+
package v1alpha1
2121

2222
import (
2323
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,7 +26,7 @@ import (
2626

2727
var (
2828
// GroupVersion is group version used to register these objects
29-
GroupVersion = schema.GroupVersion{Group: "ooto.sigs.k8s.io", Version: "v1beta1"}
29+
GroupVersion = schema.GroupVersion{Group: "ooto.sigs.k8s.io", Version: "v1alpha1"}
3030

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

‎api/v1beta1/module_types.go renamed to ‎api/v1alpha1/module_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package v1beta1
17+
package v1alpha1
1818

1919
import (
2020
v1 "k8s.io/api/core/v1"

‎api/v1beta1/zz_generated.deepcopy.go renamed to ‎api/v1alpha1/zz_generated.deepcopy.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ci/module-ooto-ci-build.template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: ooto.sigs.k8s.io/v1beta1
2+
apiVersion: ooto.sigs.k8s.io/v1alpha1
33
kind: Module
44
metadata:
55
name: ooto-ci-build

‎ci/module-ooto-ci.template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: ooto.sigs.k8s.io/v1beta1
2+
apiVersion: ooto.sigs.k8s.io/v1alpha1
33
kind: Module
44
metadata:
55
name: NAME_CHANGEME

‎config/crd/bases/ooto.sigs.k8s.io_modules.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
singular: module
1616
scope: Cluster
1717
versions:
18-
- name: v1beta1
18+
- name: v1alpha1
1919
schema:
2020
openAPIV3Schema:
2121
description: Module is the Schema for the modules API

‎config/samples/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
## Append samples you want in your CSV to this file as resources ##
22
resources:
3-
- ooto_v1beta1_module.yaml
3+
- ooto_v1alpha1_module.yaml
44
#+kubebuilder:scaffold:manifestskustomizesamples

‎config/samples/ooto_v1beta1_module.yaml renamed to ‎config/samples/ooto_v1alpha1_module.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: ooto.sigs.k8s.io/v1beta1
1+
apiVersion: ooto.sigs.k8s.io/v1alpha1
22
kind: Module
33
metadata:
44
name: module-sample

‎controllers/build/getter.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"github.com/google/go-containerregistry/pkg/name"
1010
"github.com/google/go-containerregistry/pkg/v1/remote"
1111
"github.com/google/go-containerregistry/pkg/v1/remote/transport"
12-
ootov1beta1 "github.com/qbarrand/oot-operator/api/v1beta1"
12+
ootov1alpha1 "github.com/qbarrand/oot-operator/api/v1alpha1"
1313
)
1414

1515
//go:generate mockgen -source=getter.go -package=build -destination=mock_getter.go
1616

1717
type Getter interface {
18-
ImageExists(ctx context.Context, containerImage string, po ootov1beta1.PullOptions) (bool, error)
18+
ImageExists(ctx context.Context, containerImage string, po ootov1alpha1.PullOptions) (bool, error)
1919
}
2020

2121
type getter struct{}
@@ -24,7 +24,7 @@ func NewGetter() Getter {
2424
return &getter{}
2525
}
2626

27-
func (getter) ImageExists(ctx context.Context, containerImage string, po ootov1beta1.PullOptions) (bool, error) {
27+
func (getter) ImageExists(ctx context.Context, containerImage string, po ootov1alpha1.PullOptions) (bool, error) {
2828
opts := make([]name.Option, 0)
2929

3030
if po.Insecure {

‎controllers/build/job/maker.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package job
33
import (
44
"fmt"
55

6-
ootov1beta1 "github.com/qbarrand/oot-operator/api/v1beta1"
6+
ootov1alpha1 "github.com/qbarrand/oot-operator/api/v1alpha1"
77
batchv1 "k8s.io/api/batch/v1"
88
v1 "k8s.io/api/core/v1"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -14,7 +14,7 @@ import (
1414
//go:generate mockgen -source=maker.go -package=job -destination=mock_maker.go
1515

1616
type Maker interface {
17-
MakeJob(mod ootov1beta1.Module, m ootov1beta1.KernelMapping, targetKernel string) (*batchv1.Job, error)
17+
MakeJob(mod ootov1alpha1.Module, m ootov1alpha1.KernelMapping, targetKernel string) (*batchv1.Job, error)
1818
}
1919

2020
type maker struct {
@@ -29,7 +29,7 @@ func NewMaker(namespace string, scheme *runtime.Scheme) Maker {
2929
}
3030
}
3131

32-
func (m *maker) MakeJob(mod ootov1beta1.Module, km ootov1beta1.KernelMapping, targetKernel string) (*batchv1.Job, error) {
32+
func (m *maker) MakeJob(mod ootov1alpha1.Module, km ootov1alpha1.KernelMapping, targetKernel string) (*batchv1.Job, error) {
3333
args := []string{
3434
"--destination", km.ContainerImage,
3535
"--build-arg", "KERNEL_VERSION=" + targetKernel,

‎controllers/build/job/maker_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/google/go-cmp/cmp"
55
. "github.com/onsi/ginkgo/v2"
66
. "github.com/onsi/gomega"
7-
ootov1beta1 "github.com/qbarrand/oot-operator/api/v1beta1"
7+
ootov1alpha1 "github.com/qbarrand/oot-operator/api/v1alpha1"
88
"github.com/qbarrand/oot-operator/controllers/build/job"
99
"github.com/qbarrand/oot-operator/controllers/constants"
1010
batchv1 "k8s.io/api/batch/v1"
@@ -22,12 +22,12 @@ var _ = Describe("Maker", func() {
2222
namespace = "some-namespace"
2323
)
2424

25-
mod := ootov1beta1.Module{
25+
mod := ootov1alpha1.Module{
2626
ObjectMeta: metav1.ObjectMeta{Name: moduleName},
2727
}
2828

29-
km := ootov1beta1.KernelMapping{
30-
Build: &ootov1beta1.Build{Dockerfile: dockerfile},
29+
km := ootov1alpha1.KernelMapping{
30+
Build: &ootov1alpha1.Build{Dockerfile: dockerfile},
3131
ContainerImage: containerImage,
3232
}
3333

@@ -49,7 +49,7 @@ var _ = Describe("Maker", func() {
4949
},
5050
OwnerReferences: []metav1.OwnerReference{
5151
{
52-
APIVersion: "ooto.sigs.k8s.io/v1beta1",
52+
APIVersion: "ooto.sigs.k8s.io/v1alpha1",
5353
Kind: "Module",
5454
Name: moduleName,
5555
Controller: &trueVar,

‎controllers/build/job/manager.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"errors"
66
"fmt"
77

8-
ootov1beta1 "github.com/qbarrand/oot-operator/api/v1beta1"
8+
ootov1alpha1 "github.com/qbarrand/oot-operator/api/v1alpha1"
99
"github.com/qbarrand/oot-operator/controllers/build"
1010
"github.com/qbarrand/oot-operator/controllers/constants"
1111
batchv1 "k8s.io/api/batch/v1"
@@ -31,14 +31,14 @@ func NewBuildManager(client client.Client, getter build.Getter, maker Maker, nam
3131
}
3232
}
3333

34-
func Labels(mod ootov1beta1.Module, targetKernel string) map[string]string {
34+
func Labels(mod ootov1alpha1.Module, targetKernel string) map[string]string {
3535
return map[string]string{
3636
constants.ModuleNameLabel: mod.Name,
3737
constants.TargetKernelTarget: targetKernel,
3838
}
3939
}
4040

41-
func (jbm *jobManager) getJob(ctx context.Context, mod ootov1beta1.Module, targetKernel string) (*batchv1.Job, error) {
41+
func (jbm *jobManager) getJob(ctx context.Context, mod ootov1alpha1.Module, targetKernel string) (*batchv1.Job, error) {
4242
jobList := batchv1.JobList{}
4343

4444
opts := []client.ListOption{
@@ -59,7 +59,7 @@ func (jbm *jobManager) getJob(ctx context.Context, mod ootov1beta1.Module, targe
5959
return &jobList.Items[0], nil
6060
}
6161

62-
func (jbm *jobManager) Sync(ctx context.Context, mod ootov1beta1.Module, m ootov1beta1.KernelMapping, targetKernel string) (build.Result, error) {
62+
func (jbm *jobManager) Sync(ctx context.Context, mod ootov1alpha1.Module, m ootov1alpha1.KernelMapping, targetKernel string) (build.Result, error) {
6363
logger := log.FromContext(ctx)
6464

6565
imageAvailable, err := jbm.getter.ImageExists(ctx, m.ContainerImage, m.Build.Pull)

‎controllers/build/job/manager_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/google/go-cmp/cmp"
99
. "github.com/onsi/ginkgo/v2"
1010
. "github.com/onsi/gomega"
11-
ootov1beta1 "github.com/qbarrand/oot-operator/api/v1beta1"
11+
ootov1alpha1 "github.com/qbarrand/oot-operator/api/v1alpha1"
1212
"github.com/qbarrand/oot-operator/controllers/build"
1313
"github.com/qbarrand/oot-operator/controllers/build/job"
1414
"github.com/qbarrand/oot-operator/controllers/constants"
@@ -25,7 +25,7 @@ var _ = Describe("Labels", func() {
2525
targetKernel = "1.2.3"
2626
)
2727

28-
mod := ootov1beta1.Module{
28+
mod := ootov1alpha1.Module{
2929
ObjectMeta: metav1.ObjectMeta{Name: moduleName},
3030
}
3131

@@ -54,10 +54,10 @@ var _ = Describe("JobManager", func() {
5454
namespace = "some-namespace"
5555
)
5656

57-
po := ootov1beta1.PullOptions{}
57+
po := ootov1alpha1.PullOptions{}
5858

59-
km := ootov1beta1.KernelMapping{
60-
Build: &ootov1beta1.Build{Pull: po},
59+
km := ootov1alpha1.KernelMapping{
60+
Build: &ootov1alpha1.Build{Pull: po},
6161
ContainerImage: imageName,
6262
}
6363

@@ -68,7 +68,7 @@ var _ = Describe("JobManager", func() {
6868

6969
mgr := job.NewBuildManager(nil, getter, maker, namespace)
7070

71-
_, err := mgr.Sync(ctx, ootov1beta1.Module{}, km, "")
71+
_, err := mgr.Sync(ctx, ootov1alpha1.Module{}, km, "")
7272
Expect(err).To(HaveOccurred())
7373
})
7474

@@ -80,7 +80,7 @@ var _ = Describe("JobManager", func() {
8080
mgr := job.NewBuildManager(nil, getter, maker, namespace)
8181

8282
Expect(
83-
mgr.Sync(ctx, ootov1beta1.Module{}, km, ""),
83+
mgr.Sync(ctx, ootov1alpha1.Module{}, km, ""),
8484
).To(
8585
Equal(build.Result{Status: build.StatusCompleted}),
8686
)
@@ -91,7 +91,7 @@ var _ = Describe("JobManager", func() {
9191
kernelVersion = "1.2.3"
9292
)
9393

94-
mod := ootov1beta1.Module{
94+
mod := ootov1alpha1.Module{
9595
ObjectMeta: metav1.ObjectMeta{Name: moduleName},
9696
}
9797

‎controllers/build/job/mock_maker.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎controllers/build/manager.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package build
33
import (
44
"context"
55

6-
ootov1beta1 "github.com/qbarrand/oot-operator/api/v1beta1"
6+
ootov1alpha1 "github.com/qbarrand/oot-operator/api/v1alpha1"
77
)
88

99
type Status string
@@ -22,5 +22,5 @@ type Result struct {
2222
//go:generate mockgen -source=manager.go -package=build -destination=mock_manager.go
2323

2424
type Manager interface {
25-
Sync(ctx context.Context, mod ootov1beta1.Module, m ootov1beta1.KernelMapping, targetKernel string) (Result, error)
25+
Sync(ctx context.Context, mod ootov1alpha1.Module, m ootov1alpha1.KernelMapping, targetKernel string) (Result, error)
2626
}

‎controllers/build/mock_getter.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎controllers/build/mock_manager.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎controllers/daemonset.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"errors"
66
"fmt"
77

8-
ootov1beta1 "github.com/qbarrand/oot-operator/api/v1beta1"
8+
ootov1alpha1 "github.com/qbarrand/oot-operator/api/v1alpha1"
99
"github.com/qbarrand/oot-operator/controllers/constants"
1010
appsv1 "k8s.io/api/apps/v1"
1111
v1 "k8s.io/api/core/v1"
@@ -18,8 +18,8 @@ import (
1818
//go:generate mockgen -source=daemonset.go -package=controllers -destination=mock_daemonset.go
1919

2020
type DaemonSetCreator interface {
21-
ModuleDaemonSetsByKernelVersion(ctx context.Context, mod ootov1beta1.Module) (map[string]*appsv1.DaemonSet, error)
22-
SetAsDesired(ds *appsv1.DaemonSet, image string, mod ootov1beta1.Module, kernelVersion string) error
21+
ModuleDaemonSetsByKernelVersion(ctx context.Context, mod ootov1alpha1.Module) (map[string]*appsv1.DaemonSet, error)
22+
SetAsDesired(ds *appsv1.DaemonSet, image string, mod ootov1alpha1.Module, kernelVersion string) error
2323
}
2424

2525
type daemonSetGenerator struct {
@@ -38,7 +38,7 @@ func NewDaemonSetCreator(client client.Client, kernelLabel, namespace string, sc
3838
}
3939
}
4040

41-
func (dc *daemonSetGenerator) ModuleDaemonSetsByKernelVersion(ctx context.Context, mod ootov1beta1.Module) (map[string]*appsv1.DaemonSet, error) {
41+
func (dc *daemonSetGenerator) ModuleDaemonSetsByKernelVersion(ctx context.Context, mod ootov1alpha1.Module) (map[string]*appsv1.DaemonSet, error) {
4242
dsList := appsv1.DaemonSetList{}
4343

4444
opts := []client.ListOption{
@@ -67,7 +67,7 @@ func (dc *daemonSetGenerator) ModuleDaemonSetsByKernelVersion(ctx context.Contex
6767
return dsByKernelVersion, nil
6868
}
6969

70-
func (dc *daemonSetGenerator) SetAsDesired(ds *appsv1.DaemonSet, image string, mod ootov1beta1.Module, kernelVersion string) error {
70+
func (dc *daemonSetGenerator) SetAsDesired(ds *appsv1.DaemonSet, image string, mod ootov1alpha1.Module, kernelVersion string) error {
7171
if ds == nil {
7272
return errors.New("ds cannot be nil")
7373
}

0 commit comments

Comments
 (0)