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

CRD structure prepared #24

Merged
merged 9 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repo: github.com/kyma-project/infrastructure-manager
resources:
- api:
crdVersion: v1
namespaced: true
namespaced: false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Project Config(...) will store all plugins and input data used to generate the project and APIs to better enable plugins to make useful decisions when scaffolding.

Should anything else be adjusted (or re-scaffolded ?) after this change? It's just not clear to me how this setting is exactly used.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did run make test and nothing was changed. I assume the change in CRD is enough.

controller: true
domain: kyma-project.io
group: infrastructuremanager
Expand Down
64 changes: 0 additions & 64 deletions api/v1/cluster_types.go

This file was deleted.

85 changes: 85 additions & 0 deletions api/v1/gardenercluster_types.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
/*
Copyright 2023.

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 v1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status

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

Spec GardenerClusterSpec `json:"spec"`
Status GardenerClusterStatus `json:"status,omitempty"`
}

//+kubebuilder:object:root=true

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

// GardenerClusterSpec defines the desired state of GardenerCluster
type GardenerClusterSpec struct {
Kubeconfig Kubeconfig `json:"kubeconfig"`
}

// Kubeconfig defines the desired kubeconfig location
type Kubeconfig struct {
Secret Secret `json:"secret"`
}

// SecretKeyRef defines the location, and structure of the secret containing kubeconfig
type Secret struct {
Name string `json:"name"`
Namespace string `json:"namespace"`
Key string `json:"key"`
}

type State string

const (
ReadyState State = "Ready"
ProcessingState State = "Processing"
ErrorState State = "Error"
DeletingState State = "Deleting"
)

// GardenerClusterStatus defines the observed state of GardenerCluster
type GardenerClusterStatus struct {
// State signifies current state of Gardener Cluster.
// Value can be one of ("Ready", "Processing", "Error", "Deleting").
State State `json:"state,omitempty"`

Disper marked this conversation as resolved.
Show resolved Hide resolved
// List of status conditions to indicate the status of a ServiceInstance.
// +optional
// +listType=map
// +listMapKey=type
Conditions []metav1.Condition `json:"conditions,omitempty"`
}

func init() {
SchemeBuilder.Register(&GardenerCluster{}, &GardenerClusterList{})
}
80 changes: 60 additions & 20 deletions api/v1/zz_generated.deepcopy.go

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

2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func main() {
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "Cluster")
setupLog.Error(err, "unable to create controller", "controller", "GardenerCluster")
os.Exit(1)
}
//+kubebuilder:scaffold:builder
Expand Down
Original file line number Diff line number Diff line change
@@ -1,49 +0,0 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: clusterinventories.infrastructuremanager.kyma-project.io
spec:
group: infrastructuremanager.kyma-project.io
names:
kind: infrastructuremanager
listKind: infrastructuremanagerList
plural: clusterinventories
singular: infrastructuremanager
scope: Namespaced
versions:
- name: v1
schema:
openAPIV3Schema:
description: infrastructuremanager is the Schema for the clusterinventories API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: infrastructuremanagerSpec defines the desired state of infrastructuremanager
properties:
foo:
description: Foo is an example field of infrastructuremanager. Edit infrastructuremanager_types.go
to remove/update
type: string
type: object
status:
description: infrastructuremanagerStatus defines the observed state of infrastructuremanager
type: object
type: object
served: true
storage: true
subresources:
status: {}
Loading