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

Dashboards as CRDs #8

Merged
merged 8 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from 7 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
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ RUN go mod download
COPY main.go main.go
COPY api/ api/
COPY controllers/ controllers/
COPY internal/ internal/

# Build
# the GOARCH has not a default value to allow the binary be built according to the host where the command
Expand Down
20 changes: 20 additions & 0 deletions api/v1alpha1/perses_dashboard.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package v1alpha1

import (

Choose a reason for hiding this comment

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

Not very important!
But since we're a scoped on the perses operator IMO we can avoid names like perses_dashboard we can call only dashboards.

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 would prefer to keep the perses prefix as this will be in line with the CRD name and can avoid name collisions for example when defining rbac rules.

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

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

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

if err != nil {
panic(err)
}

*out = *(temp.(*Dashboard))
}
52 changes: 52 additions & 0 deletions api/v1alpha1/persesdashboard_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"
)

// PersesDashboardStatus defines the observed state of PersesDashboard
type PersesDashboardStatus 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

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

Spec Dashboard `json:"spec,omitempty"`
Status PersesDashboardStatus `json:"status,omitempty"`
}

//+kubebuilder:object:root=true

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

func init() {
SchemeBuilder.Register(&PersesDashboard{}, &PersesDashboardList{})
}
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.

6 changes: 5 additions & 1 deletion config/crd/bases/perses.dev_perses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@ spec:
properties:
file:
properties:
case_sensitive:
type: boolean
extension:
type: string
folder:
type: string
required:
- extension
- folder
type: object
sql:
Expand All @@ -74,6 +75,8 @@ spec:
allow_old_passwords:
description: Allows the old insecure password method
type: boolean
case_sensitive:
type: boolean
check_conn_liveness:
description: Check connections for liveness before using
them
Expand Down Expand Up @@ -180,6 +183,7 @@ spec:
- allow_fallback_to_plaintext
- allow_native_passwords
- allow_old_passwords
- case_sensitive
- check_conn_liveness
- client_found_rows
- columns_with_alias
Expand Down
Loading
Loading