Skip to content
This repository has been archived by the owner on Nov 28, 2024. It is now read-only.

Commit

Permalink
add target.mpas.ocm.software CRD & update boilerplate values (#1)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmickey authored Apr 18, 2023
1 parent 5c0ddfa commit e2fe59e
Show file tree
Hide file tree
Showing 25 changed files with 413 additions and 174 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ help: ## Display this help.

.PHONY: manifests
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
$(CONTROLLER_GEN) rbac:roleName=mpas-project-manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases

.PHONY: generate
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
Expand Down
8 changes: 8 additions & 0 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,12 @@ resources:
kind: Project
path: github.com/open-component-model/mpas-project-controller/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
domain: ocm.software
group: mpas
kind: Target
path: github.com/open-component-model/mpas-project-controller/api/v1alpha1
version: v1alpha1
version: "3"
18 changes: 3 additions & 15 deletions api/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
/*
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.
*/
// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
//
// SPDX-License-Identifier: Apache-2.0

// Package v1alpha1 contains API Schema definitions for the mpas v1alpha1 API group
// +kubebuilder:object:generate=true
Expand Down
18 changes: 3 additions & 15 deletions api/v1alpha1/project_types.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
/*
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.
*/
// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
//
// SPDX-License-Identifier: Apache-2.0

package v1alpha1

Expand Down
69 changes: 69 additions & 0 deletions api/v1alpha1/target_types.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
//
// SPDX-License-Identifier: Apache-2.0

package v1alpha1

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

// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.

// TargetSpec defines the desired state of Target
type TargetSpec struct {
// Type specifies the type of the target. Possible values are: kubernetes, ssh, ociRepository
// +required
// +kubebuilder:validation:Enum=kubernetes;ssh;ociRepository
Type string `json:"type"`

Access *Access `json:"access,omitempty"`
}

// TargetStatus defines the observed state of Target
type TargetStatus struct {
// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
// Important: Run "make" to regenerate code after modifying this file
}

// Access defines the access information for a target
type Access struct {
// +required
SecretRef *TargetSecretRef `json:"secretRef"`
}

// TargetSecretRef defines the reference to a secret within the cluster
type TargetSecretRef struct {
// +required
Name string `json:"name"`

// Should we specify a default value?
// +optional
Namespace string `json:"namespace,omitempty"`
}

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

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

Spec TargetSpec `json:"spec,omitempty"`
Status TargetStatus `json:"status,omitempty"`
}

//+kubebuilder:object:root=true

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

func init() {
SchemeBuilder.Register(&Target{}, &TargetList{})
}
147 changes: 132 additions & 15 deletions api/v1alpha1/zz_generated.deepcopy.go

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

74 changes: 74 additions & 0 deletions config/crd/bases/mpas.ocm.software_targets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
name: targets.mpas.ocm.software
spec:
group: mpas.ocm.software
names:
kind: Target
listKind: TargetList
plural: targets
singular: target
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Target is the Schema for the targets 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: TargetSpec defines the desired state of Target
properties:
access:
description: Access defines the access information for a target
properties:
secretRef:
description: TargetSecretRef defines the reference to a secret
within the cluster
properties:
name:
type: string
namespace:
description: Should we specify a default value?
type: string
required:
- name
type: object
required:
- secretRef
type: object
type:
description: 'Type specifies the type of the target. Possible values
are: kubernetes, ssh, ociRepository'
enum:
- kubernetes
- ssh
- ociRepository
type: string
required:
- type
type: object
status:
description: TargetStatus defines the observed state of Target
type: object
type: object
served: true
storage: true
subresources:
status: {}
3 changes: 3 additions & 0 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@
# It should be run by config/default
resources:
- bases/mpas.ocm.software_projects.yaml
- bases/mpas.ocm.software_targets.yaml
#+kubebuilder:scaffold:crdkustomizeresource

patchesStrategicMerge:
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
# patches here are for enabling the conversion webhook for each CRD
#- patches/webhook_in_projects.yaml
#- patches/webhook_in_targets.yaml
#+kubebuilder:scaffold:crdkustomizewebhookpatch

# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
# patches here are for enabling the CA injection for each CRD
#- patches/cainjection_in_projects.yaml
#- patches/cainjection_in_targets.yaml
#+kubebuilder:scaffold:crdkustomizecainjectionpatch

# the following config is for teaching kustomize how to do kustomization for CRDs.
Expand Down
Loading

0 comments on commit e2fe59e

Please sign in to comment.