Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ tasks:
desc: Push OCM component to registry
deps: [deps:python]
cmds:
- python3 -u ./hack/push-component.py
- python3 -u ./hack/push-component.py --copy-resources
env:
PYTHONUNBUFFERED: "1"

Expand Down Expand Up @@ -97,7 +97,7 @@ tasks:
- echo "{{.DEV_VERSION}}" > VERSION
- defer: git checkout VERSION
- python3 -u ./hack/build-component.py
- python3 -u ./hack/push-component.py
- python3 -u ./hack/push-component.py --copy-resources
- cd test/e2e && go test -v -timeout 45m ./...

# ── release ───────────────────────────────────────────────────────────────
Expand Down
2 changes: 1 addition & 1 deletion component-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ VICTORIA_LOGS_IMAGE_VERSION: "v1.6.0-victorialogs"
OPENMCP_OPERATOR_VERSION: "v1.3.0"
CLUSTER_PROVIDER_KIND_VERSION: "v0.6.0"
PLATFORM_SERVICE_GATEWAY_VERSION: "v0.1.1"
KRO_VERSION: "0.9.3"
KRO_VERSION: "0.9.4"
OCM_K8S_TOOLKIT_VERSION: "0.13.0"
3 changes: 1 addition & 2 deletions hack/build-component.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def build_ocm_component(

components_location = os.environ.get("COMPONENTS_LOCATION", "")

# Execute OCM command (ocm v0.48+ syntax)
# Execute OCM command (open-component-model/ocm v0.48+ syntax)
cmd = [
"ocm", "add", "componentversions",
"--create",
Expand All @@ -178,7 +178,6 @@ def build_ocm_component(
"--lookup", components_location,
str(constructor_file),
]

run_command(cmd, env=env)


Expand Down
45 changes: 30 additions & 15 deletions resource-graph-definitions/remote-observability.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ spec:
# Currently, referencing 'schema' is not possible in the status section, so we cannot determine whether the cert-manager is enabled or not.
# This will be fixed with https://github.com/kubernetes-sigs/kro/pull/1300.
# certManager: ${schema.spec.certManager.enabled ? ( certManagerHelmDeployment.status.observedGeneration == certManagerHelmDeployment.metadata.generation ? certManagerHelmDeployment.status.phase :"Outdated") :"Disabled"}
openTelemetryOperator: ${otelOperatorHelmDeployment.status.observedGeneration == otelOperatorHelmDeployment.metadata.generation ? otelOperatorHelmDeployment.status.phase :"Outdated"}
openTelemetryCollector: ${otelCollectorResourceHelmDeployment.status.observedGeneration == otelCollectorResourceHelmDeployment.metadata.generation ? otelCollectorResourceHelmDeployment.status.phase :"Outdated"}
openTelemetryOperator: ${otelOperatorHelmDeployment.status.phase}
openTelemetryCollector: ${otelCollectorResourceHelmDeployment.status.phase}
ready: |-
${
otelOperatorHelmDeployment.status.observedGeneration == otelOperatorHelmDeployment.metadata.generation && otelOperatorHelmDeployment.status.phase == "Ready" &&
otelCollectorResourceHelmDeployment.status.observedGeneration == otelCollectorResourceHelmDeployment.metadata.generation && otelCollectorResourceHelmDeployment.status.phase == "Ready"
otelOperatorHelmDeployment.status.phase == "Ready" &&
otelCollectorResourceHelmDeployment.status.phase == "Ready"
}

resources:
Expand Down Expand Up @@ -487,18 +487,25 @@ spec:
name: otlp-logs-cert
namespace: ${schema.spec.gateway.namespace}

- id: remoteClientCertSecret
- id: clientCertSecretCopy
template:
apiVersion: v1
kind: Secret
metadata:
name: observability-client-cert
namespace: ${remoteObsNamespace.metadata.name}
type: Opaque
data:
tls.crt: ${observabilityClientCertSecret.data["tls.crt"]}
tls.key: ${observabilityClientCertSecret.data["tls.key"]}
ca.crt: ${otlpLogsCertSecret.data["tls.crt"]}
data: ${observabilityClientCertSecret.data}

- id: caCertSecretCopy
template:
apiVersion: v1
kind: Secret
metadata:
name: observability-ca-cert
namespace: ${remoteObsNamespace.metadata.name}
type: Opaque
data: ${otlpLogsCertSecret.data}

- id: observabilityGateway
externalRef:
Expand Down Expand Up @@ -559,17 +566,23 @@ spec:
endpoint: "https://${observabilityGateway.spec.listeners.filter(elem, elem.name == 'otlp-logs')[0].hostname}:${string(observabilityGateway.spec.listeners.filter(elem, elem.name == 'otlp-logs')[0].port)}/insert/opentelemetry"
tls:
enabled: true
certFile: /etc/otel/certs/tls.crt
keyFile: /etc/otel/certs/tls.key
caFile: /etc/otel/certs/ca.crt
certFile: /etc/otel/certs/client/tls.crt
keyFile: /etc/otel/certs/client/tls.key
caFile: /etc/otel/certs/ca/tls.crt
additionalVolumeMounts:
- name: observability-client-cert
mountPath: /etc/otel/certs
mountPath: /etc/otel/certs/client
readOnly: true
- name: observability-ca-cert
mountPath: /etc/otel/certs/ca
readOnly: true
additionalVolumes:
- name: observability-client-cert
secret:
secretName: ${remoteClientCertSecret.metadata.name}
secretName: ${clientCertSecretCopy.metadata.name}
- name: observability-ca-cert
secret:
secretName: ${caCertSecretCopy.metadata.name}
serviceAccount:
imagePullSecrets:
- name: ${otelCollectorImagePullSecret.metadata.name}
Expand All @@ -578,6 +591,8 @@ spec:
- source:
name: ${otelCollectorImagePullSecret.metadata.name}
- source:
name: ${remoteClientCertSecret.metadata.name}
name: ${clientCertSecretCopy.metadata.name}
- source:
name: ${caCertSecretCopy.metadata.name}
readyWhen:
- ${otelCollectorResourceHelmDeployment.status.phase == "Ready"}
46 changes: 23 additions & 23 deletions test/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/openmcp-project/observability-stack
go 1.27.1

require (
github.com/kubernetes-sigs/kro v0.9.3
github.com/kubernetes-sigs/kro v0.9.4
github.com/openmcp-project/controller-utils v0.33.1
github.com/openmcp-project/opencontrolplane-runtime v1.4.1
github.com/openmcp-project/openmcp-operator/api v1.4.1
Expand Down Expand Up @@ -58,25 +58,25 @@ require (
github.com/fluxcd/pkg/tar v1.2.0 // indirect
github.com/fluxcd/source-controller/api v1.9.5 // indirect
github.com/fsnotify/fsnotify v1.10.1 // indirect
github.com/fxamacker/cbor/v2 v2.9.2 // indirect
github.com/fxamacker/cbor/v2 v2.9.3 // indirect
github.com/go-errors/errors v1.5.1 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
github.com/go-logr/logr v1.4.4 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v1.0.0 // indirect
github.com/go-openapi/jsonreference v1.0.0 // indirect
github.com/go-openapi/swag v0.27.3 // indirect
github.com/go-openapi/swag/cmdutils v0.27.3 // indirect
github.com/go-openapi/swag/conv v0.27.3 // indirect
github.com/go-openapi/swag/fileutils v0.27.3 // indirect
github.com/go-openapi/swag/jsonutils v0.27.3 // indirect
github.com/go-openapi/swag/loading v0.27.3 // indirect
github.com/go-openapi/swag/mangling v0.27.3 // indirect
github.com/go-openapi/swag/netutils v0.27.3 // indirect
github.com/go-openapi/swag/pools v0.27.3 // indirect
github.com/go-openapi/swag/stringutils v0.27.3 // indirect
github.com/go-openapi/swag/typeutils v0.27.3 // indirect
github.com/go-openapi/swag/yamlutils v0.27.3 // indirect
github.com/go-openapi/jsonreference v1.0.1 // indirect
github.com/go-openapi/swag v0.29.1 // indirect
github.com/go-openapi/swag/cmdutils v0.29.1 // indirect
github.com/go-openapi/swag/conv v0.29.1 // indirect
github.com/go-openapi/swag/fileutils v0.29.1 // indirect
github.com/go-openapi/swag/jsonutils v0.29.1 // indirect
github.com/go-openapi/swag/loading v0.29.1 // indirect
github.com/go-openapi/swag/mangling v0.29.1 // indirect
github.com/go-openapi/swag/netutils v0.29.1 // indirect
github.com/go-openapi/swag/pools v0.29.1 // indirect
github.com/go-openapi/swag/stringutils v0.29.1 // indirect
github.com/go-openapi/swag/typeutils v0.29.1 // indirect
github.com/go-openapi/swag/yamlutils v0.29.1 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.7.1 // indirect
Expand All @@ -94,8 +94,8 @@ require (
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
github.com/lib/pq v1.12.3 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-colorable v0.1.15 // indirect
github.com/mattn/go-isatty v0.0.24 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
Expand All @@ -113,21 +113,21 @@ require (
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/procfs v0.21.1 // indirect
github.com/prometheus/client_model v0.6.3 // indirect
github.com/prometheus/procfs v0.22.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rubenv/sql-migrate v1.8.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/santhosh-tekuri/jsonschema/v6 v6.0.3 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/cast v1.10.0 // indirect
github.com/spf13/cobra v1.10.2 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/vladimirvivien/gexe v0.5.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.opentelemetry.io/otel v1.44.0 // indirect
go.opentelemetry.io/otel/trace v1.44.0 // indirect
go.opentelemetry.io/otel v1.46.0 // indirect
go.opentelemetry.io/otel/trace v1.46.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.28.0 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
Expand All @@ -150,7 +150,7 @@ require (
k8s.io/apiserver v0.37.0 // indirect
k8s.io/cli-runtime v0.37.0 // indirect
k8s.io/component-base v0.37.0 // indirect
k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad // indirect
k8s.io/kube-openapi v0.0.0-20260821135717-be32def86098 // indirect
k8s.io/kubectl v0.37.0 // indirect
k8s.io/streaming v0.37.0 // indirect
k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 // indirect
Expand Down
Loading
Loading