Skip to content

Commit 2867c26

Browse files
qiujian16qiujian16
authored
Bump library to v1.1.0 (#1216)
Signed-off-by: Jian Qiu <[email protected]>
1 parent f61f5a6 commit 2867c26

File tree

15 files changed

+128
-52
lines changed

15 files changed

+128
-52
lines changed

‎deploy/cluster-manager/olm-catalog/latest/manifests/cluster-manager.clusterserviceversion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ metadata:
5959
categories: Integration & Delivery,OpenShift Optional
6060
certified: "false"
6161
containerImage: quay.io/open-cluster-management/registration-operator:latest
62-
createdAt: "2025-10-10T01:31:41Z"
62+
createdAt: "2025-10-21T02:16:40Z"
6363
description: Manages the installation and upgrade of the ClusterManager.
6464
operators.operatorframework.io/builder: operator-sdk-v1.32.0
6565
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

‎deploy/klusterlet/olm-catalog/latest/manifests/klusterlet.clusterserviceversion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ metadata:
3131
categories: Integration & Delivery,OpenShift Optional
3232
certified: "false"
3333
containerImage: quay.io/open-cluster-management/registration-operator:latest
34-
createdAt: "2025-10-10T01:31:41Z"
34+
createdAt: "2025-10-21T02:16:41Z"
3535
description: Manages the installation and upgrade of the Klusterlet.
3636
operators.operatorframework.io/builder: operator-sdk-v1.32.0
3737
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/valyala/fasttemplate v1.2.2
2929
google.golang.org/grpc v1.68.1
3030
gopkg.in/yaml.v2 v2.4.0
31-
helm.sh/helm/v3 v3.18.5
31+
helm.sh/helm/v3 v3.18.6
3232
k8s.io/api v0.33.4
3333
k8s.io/apiextensions-apiserver v0.33.4
3434
k8s.io/apimachinery v0.33.4
@@ -39,9 +39,9 @@ require (
3939
k8s.io/kube-aggregator v0.33.4
4040
k8s.io/kubectl v0.33.4
4141
k8s.io/utils v0.0.0-20241210054802-24370beab758
42-
open-cluster-management.io/addon-framework v1.0.1-0.20250916042555-c8a4fa748ce9
43-
open-cluster-management.io/api v1.0.1-0.20251009064814-48b723491429
44-
open-cluster-management.io/sdk-go v1.0.1-0.20251016065040-b82d34b3c2c2
42+
open-cluster-management.io/addon-framework v1.1.0
43+
open-cluster-management.io/api v1.1.0
44+
open-cluster-management.io/sdk-go v1.1.0
4545
sigs.k8s.io/about-api v0.0.0-20250131010323-518069c31c03
4646
sigs.k8s.io/cluster-inventory-api v0.0.0-20240730014211-ef0154379848
4747
sigs.k8s.io/controller-runtime v0.21.0

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -533,8 +533,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
533533
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
534534
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
535535
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
536-
helm.sh/helm/v3 v3.18.5 h1:Cc3Z5vd6kDrZq9wO9KxKLNEickiTho6/H/dBNRVSos4=
537-
helm.sh/helm/v3 v3.18.5/go.mod h1:L/dXDR2r539oPlFP1PJqKAC1CUgqHJDLkxKpDGrWnyg=
536+
helm.sh/helm/v3 v3.18.6 h1:S/2CqcYnNfLckkHLI0VgQbxgcDaU3N4A/46E3n9wSNY=
537+
helm.sh/helm/v3 v3.18.6/go.mod h1:L/dXDR2r539oPlFP1PJqKAC1CUgqHJDLkxKpDGrWnyg=
538538
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
539539
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
540540
k8s.io/api v0.33.4 h1:oTzrFVNPXBjMu0IlpA2eDDIU49jsuEorGHB4cvKupkk=
@@ -561,12 +561,12 @@ k8s.io/kubectl v0.33.4 h1:nXEI6Vi+oB9hXxoAHyHisXolm/l1qutK3oZQMak4N98=
561561
k8s.io/kubectl v0.33.4/go.mod h1:Xe7P9X4DfILvKmlBsVqUtzktkI56lEj22SJW7cFy6nE=
562562
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
563563
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
564-
open-cluster-management.io/addon-framework v1.0.1-0.20250916042555-c8a4fa748ce9 h1:x0InHHM8GqY0qGYGyJx8SG7qNIOtMGs7n4EwowLksGA=
565-
open-cluster-management.io/addon-framework v1.0.1-0.20250916042555-c8a4fa748ce9/go.mod h1:IrMjmd3dLjJtrP2Aqa0Sf/3lDysJHa4j5lNQQ13NxVs=
566-
open-cluster-management.io/api v1.0.1-0.20251009064814-48b723491429 h1:jU4r3zijNA+Ab17oF7lBck0YHc7f7wM8r2RqZJw6ZSs=
567-
open-cluster-management.io/api v1.0.1-0.20251009064814-48b723491429/go.mod h1:lEc5Wkc9ON5ym/qAtIqNgrE7NW7IEOCOC611iQMlnKM=
568-
open-cluster-management.io/sdk-go v1.0.1-0.20251016065040-b82d34b3c2c2 h1:cQJuyf4p9VqqIbfpYkN8eRBrbyLpEc19WXeu8oyWpXA=
569-
open-cluster-management.io/sdk-go v1.0.1-0.20251016065040-b82d34b3c2c2/go.mod h1:DH4EMNDMiousmaj+noHYQxm48T+dbogiAfALhDnrjMg=
564+
open-cluster-management.io/addon-framework v1.1.0 h1:GoPbg5Q9KEI+Vvgs9PUs2IjIoU/BoXPHEyULVNLF/po=
565+
open-cluster-management.io/addon-framework v1.1.0/go.mod h1:KPdLM+CfUKgwVuVE9Tyu2nOuD6LgDmx94HOCnJwLIdo=
566+
open-cluster-management.io/api v1.1.0 h1:fu5xst9T/Ya6o41kqdd0zbNiDU+D3nNMTvoRVeF8j+U=
567+
open-cluster-management.io/api v1.1.0/go.mod h1:lEc5Wkc9ON5ym/qAtIqNgrE7NW7IEOCOC611iQMlnKM=
568+
open-cluster-management.io/sdk-go v1.1.0 h1:vYGkoihIVetyVT4ICO7HjoUHsnh6Gf+Da4ZSmWCamhc=
569+
open-cluster-management.io/sdk-go v1.1.0/go.mod h1:DH4EMNDMiousmaj+noHYQxm48T+dbogiAfALhDnrjMg=
570570
sigs.k8s.io/about-api v0.0.0-20250131010323-518069c31c03 h1:1ShFiMjGQOR/8jTBkmZrk1gORxnvMwm1nOy2/DbHg4U=
571571
sigs.k8s.io/about-api v0.0.0-20250131010323-518069c31c03/go.mod h1:F1pT4mK53U6F16/zuaPSYpBaR7x5Kjym6aKJJC0/DHU=
572572
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=

‎manifests/cluster-manager/hub/crds/0000_00_work.open-cluster-management.io_manifestworkreplicasets.crd.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ spec:
741741
description: Summary totals of resulting ManifestWorks for the
742742
placement
743743
properties:
744-
Applied:
744+
applied:
745745
description: 'Applied is the number of ManifestWorks with
746746
condition Applied: true'
747747
type: integer
@@ -763,7 +763,7 @@ spec:
763763
summary:
764764
description: Summary totals of resulting ManifestWorks for all placements
765765
properties:
766-
Applied:
766+
applied:
767767
description: 'Applied is the number of ManifestWorks with condition
768768
Applied: true'
769769
type: integer

‎manifests/cluster-manager/hub/crds/0000_02_addon.open-cluster-management.io_addondeploymentconfigs.crd.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ spec:
4141
properties:
4242
agentInstallNamespace:
4343
default: open-cluster-management-agent-addon
44-
description: AgentInstallNamespace is the namespace where the add-on
45-
agent should be installed on the managed cluster.
44+
description: |-
45+
AgentInstallNamespace is the namespace where the add-on agent should be installed on the managed cluster.
46+
For template-type addons: set to empty string "" to use the namespace defined in the addonTemplate.
47+
For non-template addons: defaults to "open-cluster-management-agent-addon" if not specified.
4648
maxLength: 63
47-
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
49+
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$
4850
type: string
4951
customizedVariables:
5052
description: |-

‎vendor/helm.sh/helm/v3/pkg/chartutil/jsonschema.go‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,57 @@ package chartutil
1818

1919
import (
2020
"bytes"
21+
"crypto/tls"
2122
"errors"
2223
"fmt"
2324
"strings"
25+
"time"
2426

2527
"github.com/santhosh-tekuri/jsonschema/v6"
2628

29+
"net/http"
30+
31+
"helm.sh/helm/v3/internal/version"
2732
"helm.sh/helm/v3/pkg/chart"
2833
)
2934

35+
// HTTPURLLoader implements a loader for HTTP/HTTPS URLs
36+
type HTTPURLLoader http.Client
37+
38+
func (l *HTTPURLLoader) Load(urlStr string) (any, error) {
39+
client := (*http.Client)(l)
40+
41+
req, err := http.NewRequest(http.MethodGet, urlStr, nil)
42+
if err != nil {
43+
return nil, fmt.Errorf("failed to create HTTP request for %s: %w", urlStr, err)
44+
}
45+
req.Header.Set("User-Agent", version.GetUserAgent())
46+
47+
resp, err := client.Do(req)
48+
if err != nil {
49+
return nil, fmt.Errorf("HTTP request failed for %s: %w", urlStr, err)
50+
}
51+
defer resp.Body.Close()
52+
53+
if resp.StatusCode != http.StatusOK {
54+
return nil, fmt.Errorf("HTTP request to %s returned status %d (%s)", urlStr, resp.StatusCode, http.StatusText(resp.StatusCode))
55+
}
56+
57+
return jsonschema.UnmarshalJSON(resp.Body)
58+
}
59+
60+
// newHTTPURLLoader creates a HTTP URL loader with proxy support.
61+
func newHTTPURLLoader() *HTTPURLLoader {
62+
httpLoader := HTTPURLLoader(http.Client{
63+
Timeout: 15 * time.Second,
64+
Transport: &http.Transport{
65+
Proxy: http.ProxyFromEnvironment,
66+
TLSClientConfig: &tls.Config{},
67+
},
68+
})
69+
return &httpLoader
70+
}
71+
3072
// ValidateAgainstSchema checks that values does not violate the structure laid out in schema
3173
func ValidateAgainstSchema(chrt *chart.Chart, values map[string]interface{}) error {
3274
var sb strings.Builder
@@ -68,7 +110,15 @@ func ValidateAgainstSingleSchema(values Values, schemaJSON []byte) (reterr error
68110
return err
69111
}
70112

113+
// Configure compiler with loaders for different URL schemes
114+
loader := jsonschema.SchemeURLLoader{
115+
"file": jsonschema.FileLoader{},
116+
"http": newHTTPURLLoader(),
117+
"https": newHTTPURLLoader(),
118+
}
119+
71120
compiler := jsonschema.NewCompiler()
121+
compiler.UseLoader(loader)
72122
err = compiler.AddResource("file:///values.schema.json", schema)
73123
if err != nil {
74124
return err

‎vendor/modules.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,7 @@ gopkg.in/yaml.v2
973973
# gopkg.in/yaml.v3 v3.0.1
974974
## explicit
975975
gopkg.in/yaml.v3
976-
# helm.sh/helm/v3 v3.18.5
976+
# helm.sh/helm/v3 v3.18.6
977977
## explicit; go 1.24.0
978978
helm.sh/helm/v3/internal/sympath
979979
helm.sh/helm/v3/internal/version
@@ -1733,7 +1733,7 @@ k8s.io/utils/path
17331733
k8s.io/utils/pointer
17341734
k8s.io/utils/ptr
17351735
k8s.io/utils/trace
1736-
# open-cluster-management.io/addon-framework v1.0.1-0.20250916042555-c8a4fa748ce9
1736+
# open-cluster-management.io/addon-framework v1.1.0
17371737
## explicit; go 1.24.0
17381738
open-cluster-management.io/addon-framework/pkg/addonfactory
17391739
open-cluster-management.io/addon-framework/pkg/addonmanager
@@ -1749,7 +1749,7 @@ open-cluster-management.io/addon-framework/pkg/agent
17491749
open-cluster-management.io/addon-framework/pkg/assets
17501750
open-cluster-management.io/addon-framework/pkg/index
17511751
open-cluster-management.io/addon-framework/pkg/utils
1752-
# open-cluster-management.io/api v1.0.1-0.20251009064814-48b723491429
1752+
# open-cluster-management.io/api v1.1.0
17531753
## explicit; go 1.24.0
17541754
open-cluster-management.io/api/addon/v1alpha1
17551755
open-cluster-management.io/api/client/addon/clientset/versioned
@@ -1817,7 +1817,7 @@ open-cluster-management.io/api/operator/v1
18171817
open-cluster-management.io/api/utils/work/v1/workapplier
18181818
open-cluster-management.io/api/work/v1
18191819
open-cluster-management.io/api/work/v1alpha1
1820-
# open-cluster-management.io/sdk-go v1.0.1-0.20251016065040-b82d34b3c2c2
1820+
# open-cluster-management.io/sdk-go v1.1.0
18211821
## explicit; go 1.24.0
18221822
open-cluster-management.io/sdk-go/pkg/apis/cluster/v1alpha1
18231823
open-cluster-management.io/sdk-go/pkg/apis/cluster/v1beta1

‎vendor/open-cluster-management.io/addon-framework/pkg/addonmanager/controllers/registration/controller.go‎

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

‎vendor/open-cluster-management.io/api/addon/v1alpha1/0000_02_addon.open-cluster-management.io_addondeploymentconfigs.crd.yaml‎

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

0 commit comments

Comments
 (0)