Skip to content

Commit

Permalink
Merge pull request #9 from jgbernalp/datasources-as-crds
Browse files Browse the repository at this point in the history
Datasources as CRDs
  • Loading branch information
jgbernalp authored Apr 2, 2024
2 parents 5ed26a0 + 90f7960 commit 4ccf03f
Show file tree
Hide file tree
Showing 17 changed files with 1,002 additions and 10 deletions.
20 changes: 20 additions & 0 deletions api/v1alpha1/perses_datasource.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package v1alpha1

import (
"github.com/barkimedes/go-deepcopy"
persesv1 "github.com/perses/perses/pkg/model/api/v1"
)

type Datasource struct {
persesv1.DatasourceSpec `json:",inline"`
}

func (in *Datasource) DeepCopyInto(out *Datasource) {
temp, err := deepcopy.Anything(in)

if err != nil {
panic(err)
}

*out = *(temp.(*Datasource))
}
52 changes: 52 additions & 0 deletions api/v1alpha1/persesdatasource_types.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
Copyright 2024.
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 (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// PersesDatasourceStatus defines the observed state of PersesDatasource
type PersesDatasourceStatus struct {
// +operator-sdk:csv:customresourcedefinitions:type=status
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
}

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

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

Spec Datasource `json:"spec,omitempty"`
Status PersesDatasourceStatus `json:"status,omitempty"`
}

//+kubebuilder:object:root=true

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

func init() {
SchemeBuilder.Register(&PersesDatasource{}, &PersesDatasourceList{})
}
91 changes: 91 additions & 0 deletions api/v1alpha1/zz_generated.deepcopy.go

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

138 changes: 138 additions & 0 deletions config/crd/bases/perses.dev_persesdatasources.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
name: persesdatasources.perses.dev
spec:
group: perses.dev
names:
kind: PersesDatasource
listKind: PersesDatasourceList
plural: persesdatasources
singular: persesdatasource
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: PersesDatasource is the Schema for the PersesDatasources 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:
properties:
default:
type: boolean
display:
properties:
description:
type: string
name:
type: string
type: object
plugin:
description: Plugin will contain the datasource configuration. The
data typed is available in Cue.
properties:
kind:
type: string
spec:
x-kubernetes-preserve-unknown-fields: true
required:
- kind
- spec
type: object
required:
- default
- plugin
type: object
status:
description: PersesDatasourceStatus defines the observed state of PersesDatasource
properties:
conditions:
items:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
transitioned from one status to another. This should be when
the underlying condition changed. If that is not known, then
using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: message is a human readable message indicating
details about the transition. This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: observedGeneration represents the .metadata.generation
that the condition was set based upon. For instance, if .metadata.generation
is currently 12, but the .status.conditions[x].observedGeneration
is 9, the condition is out of date with respect to the current
state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: reason contains a programmatic identifier indicating
the reason for the condition's last transition. Producers
of specific condition types may define expected values and
meanings for this field, and whether the values are considered
a guaranteed API. The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase.
--- Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
type: object
type: object
served: true
storage: true
subresources:
status: {}
1 change: 1 addition & 0 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
resources:
- bases/perses.dev_perses.yaml
- bases/perses.dev_persesdashboards.yaml
- bases/perses.dev_persesdatasources.yaml
#+kubebuilder:scaffold:crdkustomizeresource

patchesStrategicMerge:
Expand Down
7 changes: 7 additions & 0 deletions config/crd/patches/cainjection_in_persesdatasource.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# The following patch adds a directive for certmanager to inject CA into the CRD
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
name: persesdatasource.perses.dev
16 changes: 16 additions & 0 deletions config/crd/patches/webhook_in_persesdatasource.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# The following patch enables a conversion webhook for the CRD
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: persesdashboards.perses.dev
spec:
conversion:
strategy: Webhook
webhook:
clientConfig:
service:
namespace: system
name: webhook-service
path: /convert
conversionReviewVersions:
- v1
31 changes: 31 additions & 0 deletions config/rbac/persesdatasource_editor_role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# permissions for end users to edit persesdatasources.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: clusterrole
app.kubernetes.io/instance: persesdatasource-editor-role
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: perses-operator
app.kubernetes.io/part-of: perses-operator
app.kubernetes.io/managed-by: kustomize
name: persesdatasource-editor-role
rules:
- apiGroups:
- perses.dev
resources:
- persesdatasources
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- perses.dev
resources:
- persesdatasources/status
verbs:
- get
Loading

0 comments on commit 4ccf03f

Please sign in to comment.