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

fix: missing update for outputs #158

Merged
merged 2 commits into from
Mar 31, 2025
Merged

fix: missing update for outputs #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a6bdfe
fix: missing update for outputs
csatib02 Mar 28, 2025
97834e0
fix(loki-demo): invalid output name
csatib02 Mar 28, 2025
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
66 changes: 33 additions & 33 deletions docs/demos/loki/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,6 @@ spec:
collectorLabel: kubernetes
---
apiVersion: telemetry.kube-logging.dev/v1alpha1
kind: Output
metadata:
name: loki-1
namespace: tenant-demo-1
spec:
otlphttp:
endpoint: http://loki.loki.svc.cluster.local:3100/otlp/
tls:
insecure: true
---
apiVersion: telemetry.kube-logging.dev/v1alpha1
kind: Output
metadata:
name: loki-2
namespace: tenant-demo-2
spec:
otlphttp:
endpoint: http://loki.loki.svc.cluster.local:3100/otlp/
tls:
insecure: true
---
apiVersion: telemetry.kube-logging.dev/v1alpha1
kind: Tenant
metadata:
labels:
Expand All @@ -65,17 +43,6 @@ spec:
tenant: demo-1
---
apiVersion: telemetry.kube-logging.dev/v1alpha1
kind: Subscription
metadata:
name: all-logs
namespace: tenant-demo-1
spec:
condition: "true"
outputs:
- name: loki
namespace: tenant-demo-1
---
apiVersion: telemetry.kube-logging.dev/v1alpha1
kind: Tenant
metadata:
labels:
Expand All @@ -91,6 +58,17 @@ spec:
---
apiVersion: telemetry.kube-logging.dev/v1alpha1
kind: Subscription
metadata:
name: all-logs
namespace: tenant-demo-1
spec:
condition: "true"
outputs:
- name: loki-1
namespace: tenant-demo-1
---
apiVersion: telemetry.kube-logging.dev/v1alpha1
kind: Subscription
metadata:
name: all-logs
namespace: tenant-demo-2
Expand All @@ -99,3 +77,25 @@ spec:
outputs:
- name: loki-2
namespace: tenant-demo-2
---
apiVersion: telemetry.kube-logging.dev/v1alpha1
kind: Output
metadata:
name: loki-1
namespace: tenant-demo-1
spec:
otlphttp:
endpoint: http://loki.loki.svc.cluster.local:3100/otlp/
tls:
insecure: true
---
apiVersion: telemetry.kube-logging.dev/v1alpha1
kind: Output
metadata:
name: loki-2
namespace: tenant-demo-2
spec:
otlphttp:
endpoint: http://loki.loki.svc.cluster.local:3100/otlp/
tls:
insecure: true
2 changes: 0 additions & 2 deletions docs/demos/loki/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ helm upgrade --install --namespace loki --repo https://grafana.github.io/helm-ch

helm upgrade --install --wait --create-namespace --namespace telemetry-controller-system telemetry-controller oci://ghcr.io/kube-logging/helm-charts/telemetry-controller


kubectl apply -f manifests.yaml

helm upgrade --install --wait log-generator oci://ghcr.io/kube-logging/helm-charts/log-generator -n tenant-demo-1
helm upgrade --install --wait log-generator oci://ghcr.io/kube-logging/helm-charts/log-generator -n tenant-demo-2

kubectl get secret -n loki loki-grafana -o jsonpath="{.data.admin-password}" | base64 --decode
echo ""

9 changes: 8 additions & 1 deletion pkg/resources/manager/tenant_resource_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func (t *TenantResourceManager) UpdateResourcesForTenant(ctx context.Context, te

if updateErr := t.Status().Update(ctx, res); updateErr != nil {
res.SetState(state.StateFailed)
t.Logger.Error(updateErr, fmt.Sprintf("failed to set subscription (%s/%s) -> tenant (%s) reference", res.GetNamespace(), res.GetName(), tenantName))
t.Logger.Error(updateErr, fmt.Sprintf("failed to update resource (%s/%s) -> tenant (%s) reference", res.GetNamespace(), res.GetName(), tenantName))
} else {
updatedResources = append(updatedResources, res)
}
Expand Down Expand Up @@ -214,6 +214,13 @@ func (t *TenantResourceManager) ValidateSubscriptionOutputs(ctx context.Context,
continue
}

// update the output state if validation was successful
checkedOutput.SetState(state.StateReady)
if updateErr := t.Status().Update(ctx, checkedOutput); updateErr != nil {
checkedOutput.SetState(state.StateFailed)
t.Logger.Error(updateErr, fmt.Sprintf("failed to update output (%s/%s) state", checkedOutput.GetNamespace(), checkedOutput.GetName()))
}

validOutputs = append(validOutputs, outputRef)
}

Expand Down