Skip to content

Commit a66078f

Browse files
authored
Report feature versions in cluster claim (#38)
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent e1b6b77 commit a66078f

File tree

139 files changed

+9410
-2198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+9410
-2198
lines changed

go.mod

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ require (
2020
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
2121
k8s.io/kubectl v0.34.3
2222
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
23-
kmodules.xyz/client-go v0.34.2
23+
kmodules.xyz/client-go v0.34.3
2424
kmodules.xyz/fake-apiserver v0.1.1
25-
kmodules.xyz/resource-metadata v0.42.3
25+
kmodules.xyz/resource-metadata v0.42.4
2626
kubepack.dev/lib-app v0.17.0
2727
kubepack.dev/lib-helm v0.34.1
2828
open-cluster-management.io/api v1.2.0
@@ -210,7 +210,6 @@ require (
210210
github.com/rancher/rancher/pkg/client v0.0.0-20250220153925-3abb578f42fe // indirect
211211
github.com/rancher/wrangler/v3 v3.2.0-rc.3 // indirect
212212
github.com/rivo/uniseg v0.4.7 // indirect
213-
github.com/rogpeppe/go-internal v1.14.1 // indirect
214213
github.com/rubenv/sql-migrate v1.8.0 // indirect
215214
github.com/russross/blackfriday/v2 v2.1.0 // indirect
216215
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
@@ -230,17 +229,17 @@ require (
230229
github.com/zeebo/errs v1.4.0 // indirect
231230
github.com/zeebo/xxh3 v1.0.2 // indirect
232231
go.opencensus.io v0.24.0 // indirect
233-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
232+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
234233
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
235234
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
236235
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
237-
go.opentelemetry.io/otel v1.38.0 // indirect
236+
go.opentelemetry.io/otel v1.40.0 // indirect
238237
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
239238
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
240-
go.opentelemetry.io/otel/metric v1.38.0 // indirect
241-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
242-
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
243-
go.opentelemetry.io/otel/trace v1.38.0 // indirect
239+
go.opentelemetry.io/otel/metric v1.40.0 // indirect
240+
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
241+
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
242+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
244243
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
245244
go.uber.org/multierr v1.11.0 // indirect
246245
go.uber.org/zap v1.27.0 // indirect
@@ -253,7 +252,7 @@ require (
253252
golang.org/x/net v0.47.0 // indirect
254253
golang.org/x/oauth2 v0.33.0 // indirect
255254
golang.org/x/sync v0.19.0 // indirect
256-
golang.org/x/sys v0.39.0 // indirect
255+
golang.org/x/sys v0.40.0 // indirect
257256
golang.org/x/term v0.38.0 // indirect
258257
golang.org/x/text v0.32.0 // indirect
259258
golang.org/x/time v0.14.0 // indirect

go.sum

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -717,8 +717,8 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
717717
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
718718
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
719719
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
720-
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
721-
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
720+
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
721+
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
722722
go.opentelemetry.io/contrib/bridges/prometheus v0.57.0 h1:UW0+QyeyBVhn+COBec3nGhfnFe5lwB0ic1JBVjzhk0w=
723723
go.opentelemetry.io/contrib/bridges/prometheus v0.57.0/go.mod h1:ppciCHRLsyCio54qbzQv0E4Jyth/fLWDTJYfvWpcSVk=
724724
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 h1:F7q2tNlCaHY9nMKHR6XH9/qkp8FktLnIcy6jJNyOCQw=
@@ -729,8 +729,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.6
729729
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0/go.mod h1:snMWehoOh2wsEwnvvwtDyFCxVeDAODenXHtn5vzrKjo=
730730
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
731731
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
732-
go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
733-
go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
732+
go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
733+
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
734734
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0 h1:WzNab7hOOLzdDF/EoWCt4glhrbMPVMOO5JYTmpz36Ls=
735735
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.8.0/go.mod h1:hKvJwTzJdp90Vh7p6q/9PAOd55dI6WA6sWj62a/JvSs=
736736
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.8.0 h1:S+LdBGiQXtJdowoJoQPEtI52syEP/JYBUpjO49EQhV8=
@@ -755,16 +755,16 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 h1:cC2yDI3IQd0Udsu
755755
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0/go.mod h1:2PD5Ex6z8CFzDbTdOlwyNIUywRr1DN0ospafJM1wJ+s=
756756
go.opentelemetry.io/otel/log v0.8.0 h1:egZ8vV5atrUWUbnSsHn6vB8R21G2wrKqNiDt3iWertk=
757757
go.opentelemetry.io/otel/log v0.8.0/go.mod h1:M9qvDdUTRCopJcGRKg57+JSQ9LgLBrwwfC32epk5NX8=
758-
go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
759-
go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
760-
go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
761-
go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
758+
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
759+
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
760+
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
761+
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
762762
go.opentelemetry.io/otel/sdk/log v0.8.0 h1:zg7GUYXqxk1jnGF/dTdLPrK06xJdrXgqgFLnI4Crxvs=
763763
go.opentelemetry.io/otel/sdk/log v0.8.0/go.mod h1:50iXr0UVwQrYS45KbruFrEt4LvAdCaWWgIrsN3ZQggo=
764-
go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc=
765-
go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps=
766-
go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
767-
go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
764+
go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw=
765+
go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg=
766+
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
767+
go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
768768
go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
769769
go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
770770
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -893,8 +893,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
893893
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
894894
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
895895
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
896-
golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
897-
golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
896+
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
897+
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
898898
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
899899
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
900900
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -1091,16 +1091,16 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
10911091
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
10921092
kmodules.xyz/apply v0.34.0 h1:n6kAuHKAg3uzrlJccaAhjq/O4DdeiKqig9ElzoBXfzU=
10931093
kmodules.xyz/apply v0.34.0/go.mod h1:V8B55uphISoKUHWAfyntveZFEkey6WxVP3cnXOvX4eY=
1094-
kmodules.xyz/client-go v0.34.2 h1:2Cec+nyfj9kfbR+5KPK3AksxN6h4jSjhn/tw+Dhqggo=
1095-
kmodules.xyz/client-go v0.34.2/go.mod h1:kQRuGMxhb+B9rVdcfBzjK+PV7oBDo+SaDiQ66u1QG+4=
1094+
kmodules.xyz/client-go v0.34.3 h1:2K2Tjwwy62QOpgIpuRB0STDAt2e7omkKt06oC8YV+/U=
1095+
kmodules.xyz/client-go v0.34.3/go.mod h1:myCt7AfRao4PBdUtKXu01xxbqqmLZ5U8fW0LQDaifhQ=
10961096
kmodules.xyz/fake-apiserver v0.1.1 h1:o7PUFuGN9yLbBKpvuB3L0GToiMwPAlCx5LWGxLdqYP0=
10971097
kmodules.xyz/fake-apiserver v0.1.1/go.mod h1:p8XoUBP5aoGrAdXEBF0g9NUJTf34sU/Vc5mTqkv1HcM=
10981098
kmodules.xyz/go-containerregistry v0.0.15 h1:PRY5FDOzb6u23KOulQ4SWNdeUkBKmezLyJXP88q4EPw=
10991099
kmodules.xyz/go-containerregistry v0.0.15/go.mod h1:rO0DEbYYEu1BfVcZ1pXV+3RgzVXr/k5hXcO+BQYVVDI=
11001100
kmodules.xyz/offshoot-api v0.34.0 h1:HnOOp8FrCjTWjtNApRDo6Ahe79tOlLrJmyye4xxO4Kk=
11011101
kmodules.xyz/offshoot-api v0.34.0/go.mod h1:F+B59yYw4CZJ4uD4xu6C+mMLzIXUtuH7E+SbDICl9jE=
1102-
kmodules.xyz/resource-metadata v0.42.3 h1:fnQ8acF3IrkODn+Xh01Lu6fQKHR+7EvJz6TfK7rslhU=
1103-
kmodules.xyz/resource-metadata v0.42.3/go.mod h1:xntcQko2QLbLEHwGE4TQ7I/80fcBQzcexbep97Akstk=
1102+
kmodules.xyz/resource-metadata v0.42.4 h1:nFVo+PKmwWdzVwk7U3VZuKBQj3tPo6fyY5BC7gE2OB8=
1103+
kmodules.xyz/resource-metadata v0.42.4/go.mod h1:++18wSB28Wrw3ZxnOd8o8IVg7oMyWPwaPfuLw21QnPc=
11041104
kmodules.xyz/resource-metrics v0.34.0 h1:cqscgTx3PONxHj6PIySK3sTlKKv8iKTGzRd+S6YSwXg=
11051105
kmodules.xyz/resource-metrics v0.34.0/go.mod h1:R34IKtp5+NqcQz7AQJheBJK6Iem0LqrCbm/55Mn+ECQ=
11061106
kubepack.dev/kubepack v0.34.0 h1:sQ+SyobE84O+ZlLtyQBJEM0QiVYT4zzGePE3Ko7w9rY=

pkg/feature_installer/helpers.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"github.com/kluster-manager/cluster-profile/pkg/utils"
3131

3232
fluxhelm "github.com/fluxcd/helm-controller/api/v2"
33-
go_str "gomodules.xyz/x/strings"
3433
crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3534
"k8s.io/apimachinery/pkg/api/errors"
3635
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -348,7 +347,7 @@ func sanitizeFeatures(kc client.Client, clusterName string, features []string) (
348347
exclusionGroup := f.Spec.FeatureExclusionGroup
349348
if exclusionGroup != "" {
350349
// Mark the exclusion group as having an enabled feature if this feature is enabled
351-
if go_str.Contains(featuresMap.EnabledFeatures, f.Name) {
350+
if _, ok := featuresMap.EnabledFeatures[f.Name]; ok {
352351
exclusionGroupFeatures[exclusionGroup] = append(exclusionGroupFeatures[exclusionGroup], f.Name)
353352
}
354353
}
@@ -362,7 +361,7 @@ func sanitizeFeatures(kc client.Client, clusterName string, features []string) (
362361
return nil, err
363362
}
364363

365-
if go_str.Contains(featuresMap.ExternallyManagedFeatures, f) || go_str.Contains(featuresMap.DisabledFeatures, f) {
364+
if slices.Contains(featuresMap.ExternallyManagedFeatures, f) || slices.Contains(featuresMap.DisabledFeatures, f) {
366365
continue
367366
}
368367

vendor/go.opentelemetry.io/auto/sdk/internal/telemetry/id.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/auto/sdk/internal/telemetry/number.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/auto/sdk/internal/telemetry/span.go

Lines changed: 43 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/auto/sdk/internal/telemetry/status.go

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/auto/sdk/internal/telemetry/traces.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)