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.

Sign up for GitHub

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

feat: refactor, and add possibility for multiple collectors on the same tenant #40

Merged
merged 5 commits into from
Mar 7, 2024
Merged

feat: refactor, and add possibility for multiple collectors on the same tenant #40

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc8ea1a
feat: refactor, and add possibility for multiple collectors on the sa…
kristofgyuracz Mar 4, 2024
02012da
lint fix
kristofgyuracz Mar 6, 2024
12326ac
tabs vs spaces for license file
kristofgyuracz Mar 6, 2024
7013688
use lib fir finding subscriptions
kristofgyuracz Mar 7, 2024
11e8651
let there be seqs
kristofgyuracz Mar 7, 2024
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
4 changes: 3 additions & 1 deletion api/telemetry/v1alpha1/subscription_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ type SubscriptionSpec struct {

// SubscriptionStatus defines the observed state of Subscription
type SubscriptionStatus struct {
Tenant string `json:"tenant,omitempty"`
Tenant string `json:"tenant,omitempty"`
Outputs []NamespacedName `json:"outputs,omitempty"`
}

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
//+kubebuilder:printcolumn:name="Tenant",type=string,JSONPath=`.status.tenant`
//+kubebuilder:printcolumn:name="Outputs",type=string,JSONPath=`.status.outputs`
//+kubebuilder:resource:categories=telemetry-all

// Subscription is the Schema for the subscriptions API
Expand Down
17 changes: 9 additions & 8 deletions api/telemetry/v1alpha1/tenant_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,24 @@ type TenantSpec struct {
LogSourceNamespaceSelectors []metav1.LabelSelector `json:"logSourceNamespaceSelectors,omitempty"`
}

const (
StateReady = "ready"
StateFailed = "failed"
)

// TenantStatus defines the observed state of Tenant
type TenantStatus struct {
Subscriptions []string `json:"subscriptions,omitempty"`
LogSourceNamespaces []string `json:"logSourceNamespaces,omitempty"`
Collector string `json:"collector"`
Subscriptions []NamespacedName `json:"subscriptions,omitempty"`
LogSourceNamespaces []string `json:"logSourceNamespaces,omitempty"`
State string `json:"state,omitempty"`
}

//+kubebuilder:object:root=true
//+kubebuilder:resource:scope=Cluster,categories=telemetry-all
//+kubebuilder:subresource:status
//+kubebuilder:printcolumn:name="Subscriptions",type=string,JSONPath=`.status.subscriptions`
//+kubebuilder:printcolumn:name="Logsource namespaces",type=string,JSONPath=`.status.logSourceNamespaces`
//+kubebuilder:printcolumn:name="Collector",type=string,JSONPath=`.status.collector`
//+kubebuilder:printcolumn:name="State",type=string,JSONPath=`.status.state`

// Tenant is the Schema for the tenants API
type Tenant struct {
Expand All @@ -59,7 +64,3 @@ type TenantList struct {
func init() {
SchemeBuilder.Register(&Tenant{}, &TenantList{})
}

func (t *Tenant) NamespacedName() NamespacedName {
return NamespacedName{Namespace: t.Namespace, Name: t.Name}
}
9 changes: 7 additions & 2 deletions api/telemetry/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

7 changes: 7 additions & 0 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,13 @@ func main() {
os.Exit(1)
}

if err = (&controller.RouteReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "Route")
os.Exit(1)
}
if err = (&controller.CollectorReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Expand Down
15 changes: 15 additions & 0 deletions config/crd/bases/telemetry.kube-logging.dev_subscriptions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ spec:
- jsonPath: .status.tenant
name: Tenant
type: string
- jsonPath: .status.outputs
name: Outputs
type: string
name: v1alpha1
schema:
openAPIV3Schema:
Expand Down Expand Up @@ -63,6 +66,18 @@ spec:
status:
description: SubscriptionStatus defines the observed state of Subscription
properties:
outputs:
items:
properties:
name:
type: string
namespace:
type: string
required:
- name
- namespace
type: object
type: array
tenant:
type: string
type: object
Expand Down
20 changes: 13 additions & 7 deletions config/crd/bases/telemetry.kube-logging.dev_tenants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ spec:
- jsonPath: .status.logSourceNamespaces
name: Logsource namespaces
type: string
- jsonPath: .status.collector
name: Collector
- jsonPath: .status.state
name: State
type: string
name: v1alpha1
schema:
Expand Down Expand Up @@ -153,18 +153,24 @@ spec:
status:
description: TenantStatus defines the observed state of Tenant
properties:
collector:
type: string
logSourceNamespaces:
items:
type: string
type: array
state:
type: string
subscriptions:
items:
type: string
properties:
name:
type: string
namespace:
type: string
required:
- name
- namespace
type: object
type: array
required:
- collector
type: object
type: object
served: true
Expand Down
Loading
Loading