Skip to content

Commit dcda1dc

Browse files
faiqfaiq
authored
feat: bumps caaph to v0.2.3 (#691)
**What problem does this PR solve?**: bumps CAAPH to v0.2.3 **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent 434992f commit dcda1dc

File tree

6 files changed

+153
-91
lines changed

6 files changed

+153
-91
lines changed

‎api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/condition_consts.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,7 @@ const (
8181

8282
// GetCredentialsFailedReason indicates that the HelmReleaseProxy failed to get the credentials for the Helm registry.
8383
GetCredentialsFailedReason = "GetCredentialsFailed"
84+
85+
// GetCACertificateFailedReason indicates that the HelmReleaseProxy failed to get the CA certiicate for the Helm registry.
86+
GetCACertificateFailedReason = "GetCACertificateFailed"
8487
)

‎api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmchartproxy_types.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ type HelmChartProxySpec struct {
7272
// Credentials is a reference to an object containing the OCI credentials. If it is not specified, no credentials will be used.
7373
// +optional
7474
Credentials *Credentials `json:"credentials,omitempty"`
75+
76+
// TLSConfig contains the TLS configuration for a HelmChartProxy.
77+
// +optional
78+
TLSConfig *TLSConfig `json:"tlsConfig,omitempty"`
7579
}
7680

7781
type HelmOptions struct {
@@ -199,6 +203,17 @@ type Credentials struct {
199203
Key string `json:"key"`
200204
}
201205

206+
// TLSConfig defines a TLS configuration.
207+
type TLSConfig struct {
208+
// Secret is a reference to a Secret containing the TLS CA certificate at the key ca.crt.
209+
// +optional
210+
CASecretRef *corev1.SecretReference `json:"caSecret,omitempty"`
211+
212+
// InsecureSkipTLSVerify controls whether the Helm client should verify the server's certificate.
213+
// +optional
214+
InsecureSkipTLSVerify bool `json:"insecureSkipTLSVerify,omitempty"`
215+
}
216+
202217
// HelmChartProxyStatus defines the observed state of HelmChartProxy.
203218
type HelmChartProxyStatus struct {
204219
// Conditions defines current state of the HelmChartProxy.

‎api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/helmreleaseproxy_types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ type HelmReleaseProxySpec struct {
7474
// Credentials is a reference to an object containing the OCI credentials. If it is not specified, no credentials will be used.
7575
// +optional
7676
Credentials *Credentials `json:"credentials,omitempty"`
77+
78+
// TLSConfig contains the TLS configuration for the HelmReleaseProxy.
79+
TLSConfig *TLSConfig `json:"tlsConfig,omitempty"`
7780
}
7881

7982
// HelmReleaseProxyStatus defines the observed state of HelmReleaseProxy.

‎api/external/sigs.k8s.io/cluster-api-addon-provider-helm/api/v1alpha1/zz_generated.deepcopy.go

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

‎hack/third-party/caaph/go.mod

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,65 +5,64 @@ module github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/ex
55

66
go 1.21
77

8-
require sigs.k8s.io/cluster-api-addon-provider-helm v0.2.2
8+
require sigs.k8s.io/cluster-api-addon-provider-helm v0.2.3
99

1010
require (
1111
github.com/beorn7/perks v1.0.1 // indirect
1212
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1313
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
14-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
15-
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
14+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
15+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
1616
github.com/fsnotify/fsnotify v1.7.0 // indirect
1717
github.com/go-logr/logr v1.4.1 // indirect
1818
github.com/go-openapi/jsonpointer v0.19.6 // indirect
1919
github.com/go-openapi/jsonreference v0.20.2 // indirect
2020
github.com/go-openapi/swag v0.22.3 // indirect
2121
github.com/gogo/protobuf v1.3.2 // indirect
2222
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
23-
github.com/golang/protobuf v1.5.3 // indirect
23+
github.com/golang/protobuf v1.5.4 // indirect
2424
github.com/google/gnostic-models v0.6.8 // indirect
2525
github.com/google/go-cmp v0.6.0 // indirect
2626
github.com/google/gofuzz v1.2.0 // indirect
27-
github.com/google/uuid v1.3.1 // indirect
27+
github.com/google/uuid v1.4.0 // indirect
2828
github.com/imdario/mergo v0.3.13 // indirect
2929
github.com/josharian/intern v1.0.0 // indirect
3030
github.com/json-iterator/go v1.1.12 // indirect
3131
github.com/mailru/easyjson v0.7.7 // indirect
32-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
32+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
3333
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3434
github.com/modern-go/reflect2 v1.0.2 // indirect
3535
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3636
github.com/pkg/errors v0.9.1 // indirect
3737
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
38-
github.com/prometheus/client_golang v1.17.0 // indirect
39-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
40-
github.com/prometheus/common v0.44.0 // indirect
41-
github.com/prometheus/procfs v0.11.1 // indirect
38+
github.com/prometheus/client_golang v1.18.0 // indirect
39+
github.com/prometheus/client_model v0.5.0 // indirect
40+
github.com/prometheus/common v0.45.0 // indirect
41+
github.com/prometheus/procfs v0.12.0 // indirect
4242
github.com/spf13/pflag v1.0.5 // indirect
43-
go.uber.org/goleak v1.3.0 // indirect
4443
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
45-
golang.org/x/net v0.24.0 // indirect
46-
golang.org/x/oauth2 v0.14.0 // indirect
47-
golang.org/x/sys v0.19.0 // indirect
48-
golang.org/x/term v0.19.0 // indirect
49-
golang.org/x/text v0.14.0 // indirect
50-
golang.org/x/time v0.3.0 // indirect
44+
golang.org/x/net v0.25.0 // indirect
45+
golang.org/x/oauth2 v0.18.0 // indirect
46+
golang.org/x/sys v0.20.0 // indirect
47+
golang.org/x/term v0.20.0 // indirect
48+
golang.org/x/text v0.15.0 // indirect
49+
golang.org/x/time v0.5.0 // indirect
5150
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
52-
google.golang.org/appengine v1.6.7 // indirect
51+
google.golang.org/appengine v1.6.8 // indirect
5352
google.golang.org/protobuf v1.33.0 // indirect
5453
gopkg.in/inf.v0 v0.9.1 // indirect
5554
gopkg.in/yaml.v2 v2.4.0 // indirect
5655
gopkg.in/yaml.v3 v3.0.1 // indirect
57-
k8s.io/api v0.29.0 // indirect
58-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
59-
k8s.io/apimachinery v0.29.0 // indirect
60-
k8s.io/client-go v0.29.0 // indirect
61-
k8s.io/component-base v0.29.0 // indirect
56+
k8s.io/api v0.29.3 // indirect
57+
k8s.io/apiextensions-apiserver v0.29.3 // indirect
58+
k8s.io/apimachinery v0.29.3 // indirect
59+
k8s.io/client-go v0.29.3 // indirect
60+
k8s.io/component-base v0.29.3 // indirect
6261
k8s.io/klog/v2 v2.110.1 // indirect
6362
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
6463
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
65-
sigs.k8s.io/cluster-api v1.6.4 // indirect
66-
sigs.k8s.io/controller-runtime v0.16.5 // indirect
64+
sigs.k8s.io/cluster-api v1.7.2 // indirect
65+
sigs.k8s.io/controller-runtime v0.17.3 // indirect
6766
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6867
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
6968
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)