Skip to content

Commit

Permalink
Merge pull request #36 from onmetal/enh/machineclass
Browse files Browse the repository at this point in the history
Added machine class and improved account and scope controller
  • Loading branch information
afritzler authored Jul 5, 2021
2 parents 4feba59 + 3cc4bac commit 0d51125
Show file tree
Hide file tree
Showing 25 changed files with 921 additions and 123 deletions.
8 changes: 8 additions & 0 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,12 @@ resources:
kind: Scope
path: github.com/onmetal/onmetal-api/apis/core/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
controller: true
domain: onmetal.de
group: compute
kind: MachineClass
path: github.com/onmetal/onmetal-api/apis/compute/v1alpha1
version: v1alpha1
version: "3"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# onmetal
# onmetal-api

This is a bleeding edge API POC.
This project contains the types and controllers of the user facing OnMetal API.

## Installation

Expand Down
34 changes: 34 additions & 0 deletions apis/common/v1alpha1/classes.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright 2021.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package v1alpha1

//+kubebuilder:object:generate=true

type Availability []RegionAvailability

//+kubebuilder:object:generate=true

type RegionAvailability struct {
Name string `json:"region"`
Zones []ZoneAvailability `json:"availabilityZone"`
}

//+kubebuilder:object:generate=true

type ZoneAvailability struct {
Name string `json:"name"`
}
79 changes: 79 additions & 0 deletions apis/common/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions apis/compute/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
Copyright 2021.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

// Package v1alpha1 contains API Schema definitions for the compute v1alpha1 API group
//+kubebuilder:object:generate=true
//+groupName=compute.onmetal.de
package v1alpha1

import (
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/scheme"
)

var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "compute.onmetal.de", Version: "v1alpha1"}

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

// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme
)
67 changes: 67 additions & 0 deletions apis/compute/v1alpha1/machineclass_types.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*
Copyright 2021.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1

import (
common "github.com/onmetal/onmetal-api/apis/common/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// MachineClassSpec defines the desired state of MachineClass
type MachineClassSpec struct {
// Capabilities describes the features of the MachineClass
Capabilities []Capability `json:"capabilities"`
}

// Capability describes a single feature of a MachineClass
type Capability struct {
Name *string `json:"name,omitempty"`
Type *string `json:"type,omitempty"`
Value *string `json:"value,omitempty"`
}

// MachineClassStatus defines the observed state of MachineClass
type MachineClassStatus struct {
// Availability describes the regions and zones where this MachineClass is available
Availability common.Availability `json:"availability,omitempty"`
}

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status
//+kubebuilder:resource:scope=Cluster

// MachineClass is the Schema for the machineclasses API
type MachineClass struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

Spec MachineClassSpec `json:"spec,omitempty"`
Status MachineClassStatus `json:"status,omitempty"`
}

//+kubebuilder:object:root=true

// MachineClassList contains a list of MachineClass
type MachineClassList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
Items []MachineClass `json:"items"`
}

func init() {
SchemeBuilder.Register(&MachineClass{}, &MachineClassList{})
}
Loading

0 comments on commit 0d51125

Please sign in to comment.