Skip to content

Commit 894c417

Browse files
jan--fjan--f
committed
Merge branch 'main' into sync-main
2 parents f636b7b + 7f3b32b commit 894c417

File tree

11 files changed

+119
-166
lines changed

11 files changed

+119
-166
lines changed

‎.github/olm-publish/action.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,15 @@ runs:
3838
# branch further down in this action. In some make targets we use main's sha
3939
# and by creating a branch here we can just assume local main is the same as
4040
# remote main.
41-
run: git checkout -b olm-publish-action-scratch
41+
run: |
42+
# Discard any uncommitted changes from previous steps (e.g., standard-version)
43+
git reset --hard HEAD
44+
git clean -fd
45+
git checkout -b olm-publish-action-scratch
46+
47+
- name: Fetch olm-catalog branch
48+
shell: bash
49+
run: git fetch origin olm-catalog
4250

4351
- name: Git merge olm-catalog branch
4452
shell: bash

‎bundle/manifests/observability-operator.clusterserviceversion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ metadata:
4343
certified: "false"
4444
console.openshift.io/operator-monitoring-default: "true"
4545
containerImage: observability-operator:1.3.0
46-
createdAt: "2026-02-24T14:15:08Z"
46+
createdAt: "2026-03-04T16:28:53Z"
4747
description: A Go based Kubernetes operator to setup and manage highly available
4848
Monitoring Stack using Prometheus, Alertmanager and Thanos Querier.
4949
operatorframework.io/cluster-monitoring: "true"

‎bundle/manifests/observability.openshift.io_uiplugins.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,8 @@ spec:
267267
conditions:
268268
description: Conditions provide status information about the plugin.
269269
items:
270+
description: Condition contains details for one aspect of the current
271+
state of this API Resource.
270272
properties:
271273
lastTransitionTime:
272274
description: |-
@@ -300,17 +302,14 @@ spec:
300302
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
301303
type: string
302304
status:
303-
description: status of the condition
305+
description: status of the condition, one of True, False, Unknown.
304306
enum:
305307
- "True"
306308
- "False"
307309
- Unknown
308-
- Degraded
309310
type: string
310311
type:
311-
description: |-
312-
type of condition in CamelCase or in foo.example.com/CamelCase.
313-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
312+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
314313
maxLength: 316
315314
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])$
316315
type: string

‎cmd/operator/main.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,20 @@ var defaultImages = map[string]string{
4646
"ui-distributed-tracing": "quay.io/openshift-observability-ui/distributed-tracing-console-plugin:v1.0.2",
4747
"ui-logging-pf4": "quay.io/openshift-observability-ui/logging-view-plugin:v6.0.4",
4848
"ui-logging": "quay.io/openshift-observability-ui/logging-view-plugin:v6.1.5",
49+
<<<<<<< HEAD
4950
"korrel8r": "quay.io/korrel8r/korrel8r:0.8.4",
51+
||||||| 8bb890bd
52+
"ui-dashboards": "quay.io/openshift-observability-ui/console-dashboards-plugin:v0.4.1",
53+
"ui-troubleshooting-panel": "quay.io/openshift-observability-ui/troubleshooting-panel-console-plugin:v0.4.3",
54+
"ui-distributed-tracing-pf4": "quay.io/openshift-observability-ui/distributed-tracing-console-plugin:v0.3.1",
55+
"ui-distributed-tracing-pf5": "quay.io/openshift-observability-ui/distributed-tracing-console-plugin:v0.4.1",
56+
"ui-distributed-tracing": "quay.io/openshift-observability-ui/distributed-tracing-console-plugin:v1.0.1",
57+
"ui-logging-pf4": "quay.io/openshift-observability-ui/logging-view-plugin:v6.0.1",
58+
"ui-logging": "quay.io/openshift-observability-ui/logging-view-plugin:v6.1.2",
59+
"korrel8r": "quay.io/korrel8r/korrel8r:0.8.4",
60+
=======
61+
"korrel8r": "quay.io/korrel8r/korrel8r:0.9.1",
62+
>>>>>>> main
5063
"health-analyzer": "quay.io/openshiftanalytics/cluster-health-analyzer:v1.1.0",
5164
"ui-monitoring-pf5": "quay.io/openshift-observability-ui/monitoring-console-plugin:v0.4.4",
5265
"ui-monitoring": "quay.io/openshift-observability-ui/monitoring-console-plugin:v0.5.3",

‎deploy/crds/common/observability.openshift.io_uiplugins.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,8 @@ spec:
267267
conditions:
268268
description: Conditions provide status information about the plugin.
269269
items:
270+
description: Condition contains details for one aspect of the current
271+
state of this API Resource.
270272
properties:
271273
lastTransitionTime:
272274
description: |-
@@ -300,17 +302,14 @@ spec:
300302
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
301303
type: string
302304
status:
303-
description: status of the condition
305+
description: status of the condition, one of True, False, Unknown.
304306
enum:
305307
- "True"
306308
- "False"
307309
- Unknown
308-
- Degraded
309310
type: string
310311
type:
311-
description: |-
312-
type of condition in CamelCase or in foo.example.com/CamelCase.
313-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
312+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
314313
maxLength: 316
315314
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])$
316315
type: string

‎docs/api.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5727,7 +5727,7 @@ It should always be reconstructable from the state of the cluster and/or outside
57275727

57285728

57295729

5730-
5730+
Condition contains details for one aspect of the current state of this API Resource.
57315731

57325732
<table>
57335733
<thead>
@@ -5771,17 +5771,16 @@ This field may not be empty.<br/>
57715771
<td><b>status</b></td>
57725772
<td>enum</td>
57735773
<td>
5774-
status of the condition<br/>
5774+
status of the condition, one of True, False, Unknown.<br/>
57755775
<br/>
5776-
<i>Enum</i>: True, False, Unknown, Degraded<br/>
5776+
<i>Enum</i>: True, False, Unknown<br/>
57775777
</td>
57785778
<td>true</td>
57795779
</tr><tr>
57805780
<td><b>type</b></td>
57815781
<td>string</td>
57825782
<td>
5783-
type of condition in CamelCase or in foo.example.com/CamelCase.
5784-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)<br/>
5783+
type of condition in CamelCase or in foo.example.com/CamelCase.<br/>
57855784
</td>
57865785
<td>true</td>
57875786
</tr><tr>

‎go.mod‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/go-logr/logr v1.4.3
88
github.com/goccy/go-yaml v1.19.0
99
github.com/google/go-cmp v0.7.0
10-
github.com/grafana/tempo-operator v0.18.0
10+
github.com/grafana/tempo-operator v0.20.0
1111
github.com/open-telemetry/opentelemetry-operator v0.135.0
1212
github.com/openshift/api v3.9.0+incompatible // PINNED: newer versions remove console/v1alpha1 API needed for OpenShift <4.17 compatibility
1313
github.com/operator-framework/api v0.38.0
@@ -29,13 +29,13 @@ require (
2929
golang.org/x/mod v0.33.0
3030
gopkg.in/yaml.v3 v3.0.1
3131
gotest.tools/v3 v3.5.2
32-
k8s.io/api v0.35.1
33-
k8s.io/apiextensions-apiserver v0.34.3
34-
k8s.io/apimachinery v0.35.1
35-
k8s.io/apiserver v0.35.1
36-
k8s.io/client-go v0.35.1
37-
k8s.io/component-base v0.35.1
38-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
32+
k8s.io/api v0.35.2
33+
k8s.io/apiextensions-apiserver v0.35.2
34+
k8s.io/apimachinery v0.35.2
35+
k8s.io/apiserver v0.35.2
36+
k8s.io/client-go v0.35.2
37+
k8s.io/component-base v0.35.2
38+
k8s.io/utils v0.0.0-20260108192941-914a6e750570
3939
sigs.k8s.io/controller-runtime v0.22.4
4040
)
4141

@@ -100,6 +100,7 @@ require (
100100
github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 // indirect
101101
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
102102
github.com/hashicorp/go-version v1.8.0 // indirect
103+
github.com/imdario/mergo v0.3.16 // indirect
103104
github.com/inconshreveable/mousetrap v1.1.0 // indirect
104105
github.com/jpillora/backoff v1.0.0 // indirect
105106
github.com/json-iterator/go v1.1.12 // indirect
@@ -127,7 +128,7 @@ require (
127128
github.com/prometheus/client_golang v1.23.2 // indirect
128129
github.com/prometheus/client_model v0.6.2 // indirect
129130
github.com/prometheus/otlptranslator v1.0.0 // indirect
130-
github.com/prometheus/procfs v0.17.0 // indirect
131+
github.com/prometheus/procfs v0.19.2 // indirect
131132
github.com/prometheus/prometheus v0.309.1 // indirect
132133
github.com/rhobs/obo-prometheus-operator/pkg/client v0.89.0-rhobs1 // indirect
133134
github.com/shopspring/decimal v1.4.0 // indirect
@@ -152,7 +153,7 @@ require (
152153
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
153154
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 // indirect
154155
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0 // indirect
155-
go.opentelemetry.io/otel/exporters/prometheus v0.60.0 // indirect
156+
go.opentelemetry.io/otel/exporters/prometheus v0.61.0 // indirect
156157
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.14.0 // indirect
157158
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0 // indirect
158159
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect

‎go.sum‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5T
261261
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
262262
github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 h1:cLN4IBkmkYZNnk7EAJ0BHIethd+J6LqxFNw5mSiI2bM=
263263
github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
264-
github.com/grafana/tempo-operator v0.18.0 h1:ihXddVx2/I9EbMTkPBnbnN0Uc19sjxAFDx2BqublXqQ=
265-
github.com/grafana/tempo-operator v0.18.0/go.mod h1:xt66ENn9wlMOqj0OAtoiNm3w+JIah4LAeX/XZgdsLsU=
264+
github.com/grafana/tempo-operator v0.20.0 h1:OMk5H6aBuQEFZikYFu3C6NMLPbpVt2asUDxmQWEcuIg=
265+
github.com/grafana/tempo-operator v0.20.0/go.mod h1:dT49eTfAyFSw7v1DRAbn9uIegbZGUVVb28186uUXtJA=
266266
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 h1:NmZ1PKzSTQbuGHw9DGPFomqkkLWMC+vZCkfs+FHv1Vg=
267267
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3/go.mod h1:zQrxl1YP88HQlA6i9c63DSVPFklWpGX4OWAc9bFuaH4=
268268
github.com/hashicorp/consul/api v1.32.1 h1:0+osr/3t/aZNAdJX558crU3PEjVrG4x6715aZHRgceE=
@@ -293,6 +293,8 @@ github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY
293293
github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
294294
github.com/hetznercloud/hcloud-go/v2 v2.32.0 h1:BRe+k7ESdYv3xQLBGdKUfk+XBFRJNGKzq70nJI24ciM=
295295
github.com/hetznercloud/hcloud-go/v2 v2.32.0/go.mod h1:hAanyyfn9M0cMmZ68CXzPCF54KRb9EXd8eiE2FHKGIE=
296+
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
297+
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
296298
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
297299
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
298300
github.com/ionos-cloud/sdk-go/v6 v6.3.5 h1:6fHArdV1lf50iRhCkCP7wkvGwWzVwi+l9w1t5mwkOa8=
@@ -436,8 +438,8 @@ github.com/prometheus/otlptranslator v1.0.0/go.mod h1:vRYWnXvI6aWGpsdY/mOT/cbeVR
436438
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
437439
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
438440
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
439-
github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
440-
github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
441+
github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
442+
github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
441443
github.com/prometheus/prometheus v0.309.1 h1:jutK6eCYDpWdPTUbVbkcQsNCMO9CCkSwjQRMLds4jSo=
442444
github.com/prometheus/prometheus v0.309.1/go.mod h1:d+dOGiVhuNDa4MaFXHVdnUBy/CzqlcNTooR8oM1wdTU=
443445
github.com/prometheus/sigv4 v0.4.0 h1:s8oiq+S4ORkpjftnBvzObLrz5Hw49YwEhumNGBdfg4M=
@@ -521,8 +523,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0 h1:in9O8
521523
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0/go.mod h1:Rp0EXBm5tfnv0WL+ARyO/PHBEaEAT8UUHQ6AGJcSq6c=
522524
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0 h1:Ckwye2FpXkYgiHX7fyVrN1uA/UYd9ounqqTuSNAv0k4=
523525
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0/go.mod h1:teIFJh5pW2y+AN7riv6IBPX2DuesS3HgP39mwOspKwU=
524-
go.opentelemetry.io/otel/exporters/prometheus v0.60.0 h1:cGtQxGvZbnrWdC2GyjZi0PDKVSLWP/Jocix3QWfXtbo=
525-
go.opentelemetry.io/otel/exporters/prometheus v0.60.0/go.mod h1:hkd1EekxNo69PTV4OWFGZcKQiIqg0RfuWExcPKFvepk=
526+
go.opentelemetry.io/otel/exporters/prometheus v0.61.0 h1:cCyZS4dr67d30uDyh8etKM2QyDsQ4zC9ds3bdbrVoD0=
527+
go.opentelemetry.io/otel/exporters/prometheus v0.61.0/go.mod h1:iivMuj3xpR2DkUrUya3TPS/Z9h3dz7h01GxU+fQBRNg=
526528
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.14.0 h1:B/g+qde6Mkzxbry5ZZag0l7QrQBCtVm7lVjaLgmpje8=
527529
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.14.0/go.mod h1:mOJK8eMmgW6ocDJn6Bn11CcZ05gi3P8GylBXEkZtbgA=
528530
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0 h1:wm/Q0GAAykXv83wzcKzGGqAnnfLFyFe7RslekZuv+VI=
@@ -649,24 +651,24 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
649651
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
650652
gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
651653
gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
652-
k8s.io/api v0.35.1 h1:0PO/1FhlK/EQNVK5+txc4FuhQibV25VLSdLMmGpDE/Q=
653-
k8s.io/api v0.35.1/go.mod h1:28uR9xlXWml9eT0uaGo6y71xK86JBELShLy4wR1XtxM=
654-
k8s.io/apiextensions-apiserver v0.34.3 h1:p10fGlkDY09eWKOTeUSioxwLukJnm+KuDZdrW71y40g=
655-
k8s.io/apiextensions-apiserver v0.34.3/go.mod h1:aujxvqGFRdb/cmXYfcRTeppN7S2XV/t7WMEc64zB5A0=
656-
k8s.io/apimachinery v0.35.1 h1:yxO6gV555P1YV0SANtnTjXYfiivaTPvCTKX6w6qdDsU=
657-
k8s.io/apimachinery v0.35.1/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
658-
k8s.io/apiserver v0.35.1 h1:potxdhhTL4i6AYAa2QCwtlhtB1eCdWQFvJV6fXgJzxs=
659-
k8s.io/apiserver v0.35.1/go.mod h1:BiL6Dd3A2I/0lBnteXfWmCFobHM39vt5+hJQd7Lbpi4=
660-
k8s.io/client-go v0.35.1 h1:+eSfZHwuo/I19PaSxqumjqZ9l5XiTEKbIaJ+j1wLcLM=
661-
k8s.io/client-go v0.35.1/go.mod h1:1p1KxDt3a0ruRfc/pG4qT/3oHmUj1AhSHEcxNSGg+OA=
662-
k8s.io/component-base v0.35.1 h1:XgvpRf4srp037QWfGBLFsYMUQJkE5yMa94UsJU7pmcE=
663-
k8s.io/component-base v0.35.1/go.mod h1:HI/6jXlwkiOL5zL9bqA3en1Ygv60F03oEpnuU1G56Bs=
654+
k8s.io/api v0.35.2 h1:tW7mWc2RpxW7HS4CoRXhtYHSzme1PN1UjGHJ1bdrtdw=
655+
k8s.io/api v0.35.2/go.mod h1:7AJfqGoAZcwSFhOjcGM7WV05QxMMgUaChNfLTXDRE60=
656+
k8s.io/apiextensions-apiserver v0.35.2 h1:iyStXHoJZsUXPh/nFAsjC29rjJWdSgUmG1XpApE29c0=
657+
k8s.io/apiextensions-apiserver v0.35.2/go.mod h1:OdyGvcO1FtMDWQ+rRh/Ei3b6X3g2+ZDHd0MSRGeS8rU=
658+
k8s.io/apimachinery v0.35.2 h1:NqsM/mmZA7sHW02JZ9RTtk3wInRgbVxL8MPfzSANAK8=
659+
k8s.io/apimachinery v0.35.2/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
660+
k8s.io/apiserver v0.35.2 h1:rb52v0CZGEL0FkhjS+I6jHflAp7fZ4MIaKcEHX7wmDk=
661+
k8s.io/apiserver v0.35.2/go.mod h1:CROJUAu0tfjZLyYgSeBsBan2T7LUJGh0ucWwTCSSk7g=
662+
k8s.io/client-go v0.35.2 h1:YUfPefdGJA4aljDdayAXkc98DnPkIetMl4PrKX97W9o=
663+
k8s.io/client-go v0.35.2/go.mod h1:4QqEwh4oQpeK8AaefZ0jwTFJw/9kIjdQi0jpKeYvz7g=
664+
k8s.io/component-base v0.35.2 h1:btgR+qNrpWuRSuvWSnQYsZy88yf5gVwemvz0yw79pGc=
665+
k8s.io/component-base v0.35.2/go.mod h1:B1iBJjooe6xIJYUucAxb26RwhAjzx0gHnqO9htWIX+0=
664666
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
665667
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
666668
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=
667669
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
668-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
669-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
670+
k8s.io/utils v0.0.0-20260108192941-914a6e750570 h1:JT4W8lsdrGENg9W+YwwdLJxklIuKWdRm+BC+xt33FOY=
671+
k8s.io/utils v0.0.0-20260108192941-914a6e750570/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
670672
sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
671673
sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
672674
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=

‎pkg/apis/uiplugin/v1alpha1/types.go‎

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ type UIPluginSpec struct {
287287
type UIPluginStatus struct {
288288
// Conditions provide status information about the plugin.
289289
// +listType=atomic
290-
Conditions []Condition `json:"conditions"`
290+
Conditions []metav1.Condition `json:"conditions"`
291291
}
292292

293293
type ConditionStatus string
@@ -299,60 +299,8 @@ type ConditionStatus string
299299
type ConditionType string
300300

301301
const (
302-
ConditionTrue ConditionStatus = "True"
303-
ConditionFalse ConditionStatus = "False"
304-
ConditionUnknown ConditionStatus = "Unknown"
305-
306302
ReconciledCondition ConditionType = "Reconciled"
307303
AvailableCondition ConditionType = "Available"
308304
ResourceDiscoveryCondition ConditionType = "ResourceDiscovery"
309305
DegradedCondition ConditionType = "Degraded"
310306
)
311-
312-
type Condition struct {
313-
// type of condition in CamelCase or in foo.example.com/CamelCase.
314-
// The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
315-
Type ConditionType `json:"type"`
316-
// observedGeneration represents the .metadata.generation that the condition was set based upon.
317-
// For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
318-
// with respect to the current state of the instance.
319-
// +optional
320-
// +kubebuilder:validation:Minimum=0
321-
ObservedGeneration int64 `json:"observedGeneration,omitempty"`
322-
// lastTransitionTime is the last time the condition transitioned from one status to another.
323-
// This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
324-
// +required
325-
// +kubebuilder:validation:Required
326-
// +kubebuilder:validation:Type=string
327-
// +kubebuilder:validation:Format=date-time
328-
LastTransitionTime metav1.Time `json:"lastTransitionTime"`
329-
// reason contains a programmatic identifier indicating the reason for the condition's last transition.
330-
// Producers of specific condition types may define expected values and meanings for this field,
331-
// and whether the values are considered a guaranteed API.
332-
// The value should be a CamelCase string.
333-
// This field may not be empty.
334-
// +required
335-
// +kubebuilder:validation:Required
336-
// +kubebuilder:validation:MaxLength=1024
337-
// +kubebuilder:validation:MinLength=1
338-
// +kubebuilder:validation:Pattern=`^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$`
339-
Reason string `json:"reason"`
340-
// message is a human readable message indicating details about the transition.
341-
// This may be an empty string.
342-
// +required
343-
// +kubebuilder:validation:Required
344-
// +kubebuilder:validation:MaxLength=32768
345-
Message string `json:"message"`
346-
// status of the condition
347-
// +required
348-
// +kubebuilder:validation:Required
349-
// +kubebuilder:validation:Enum=True;False;Unknown;Degraded
350-
Status ConditionStatus `json:"status"`
351-
}
352-
353-
func (c Condition) Equal(n Condition) bool {
354-
if c.Reason == n.Reason && c.Status == n.Status && c.Message == n.Message && c.ObservedGeneration == n.ObservedGeneration {
355-
return true
356-
}
357-
return false
358-
}

0 commit comments

Comments
 (0)