Skip to content

Commit

Permalink
Update rollout lib (#276)
Browse files Browse the repository at this point in the history
Signed-off-by: melserngawy <[email protected]>

Fix: run `make update` fail because deepcopy doesn't support generic type. (#288)

Signed-off-by: xuezhaojun <[email protected]>

Fix verify ci step missing. (#289)

Signed-off-by: xuezhaojun <[email protected]>

:bug: Use controller-runtime for deepcopy generation for cluster:v1alpha1 (#291)

* Revert "Fix: run `make update` fail because deepcopy doesn't support generic type. (#288)"

This reverts commit ae208c8.

Signed-off-by: Dale Haiducek <[email protected]>

* Use `controller-gen` for deepcopy cluster:v1alpha1

GenGo isn't respecting the `+k8s:deepcopy-gen=false` tag to skip
generation for the generic type

Signed-off-by: Dale Haiducek <[email protected]>

---------

Signed-off-by: Dale Haiducek <[email protected]>

🐛 add ca bundle to addon proxy settings (#293)

Signed-off-by: Yang Le <[email protected]>

Revert "remove ClusterSet ClusterSetBinding API version v1beta1 (#266)"

This reverts commit 9675ab7.

Signed-off-by: haoqing0110 <[email protected]>
  • Loading branch information
serngawy authored and haoqing0110 committed Nov 24, 2023
1 parent eb6bdf7 commit 55ed983
Show file tree
Hide file tree
Showing 35 changed files with 4,261 additions and 573 deletions.
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,14 @@ verify-scripts:
bash -x hack/verify-crds.sh
bash -x hack/verify-codegen.sh
.PHONY: verify-scripts
# verify: check-env verify-scripts verify-codegen-crds verify-gocilint
verify: verify-gocilint
verify: check-env verify-scripts verify-codegen-crds verify-gocilint

update-scripts:
hack/update-deepcopy.sh
# Using controller-gen as a workaround for cluster:v1alpha1 because gengo
# isn't respecting deepcopy-gen:false nor does it support generics
# Issue: https://github.com/kubernetes/gengo/issues/225
$(CONTROLLER_GEN) object:headerFile="hack/empty.txt" paths="./cluster/v1alpha1"
hack/update-swagger-docs.sh
hack/update-codegen.sh
hack/update-v1beta1-crds.sh
Expand All @@ -71,7 +74,7 @@ include ./test/integration-test.mk

check-env:
ifeq ($(GOPATH),)
$(warning "environment variable GOPATH is empty, auto set from go env GOPATH")
$(warning "environment variable GOPATH is empty, auto set from go env GOPATH")
export GOPATH=$(shell go env GOPATH)
endif
.PHONY: check-env
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,12 @@ spec:
description: ProxyConfig holds proxy settings for add-on agent on
the managed cluster. Empty means no proxy settings is available.
properties:
caBundle:
description: CABundle is a CA certificate bundle to verify the
proxy server. And it's only useful when HTTPSProxy is set and
a HTTPS proxy server is specified.
format: byte
type: string
httpProxy:
description: HTTPProxy is the URL of the proxy for HTTP requests
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ spec:
listKind: AddOnTemplateList
plural: addontemplates
singular: addontemplate
preserveUnknownFields: false
scope: Cluster
versions:
- additionalPrinterColumns:
Expand Down
5 changes: 5 additions & 0 deletions addon/v1alpha1/types_addondeploymentconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ type ProxyConfig struct {
// +optional
HTTPSProxy string `json:"httpsProxy,omitempty"`

// CABundle is a CA certificate bundle to verify the proxy server.
// And it's only useful when HTTPSProxy is set and a HTTPS proxy server is specified.
// +optional
CABundle []byte `json:"caBundle,omitempty"`

// NoProxy is a comma-separated list of hostnames and/or CIDRs and/or IPs for which the proxy
// should not be used.
// +optional
Expand Down
7 changes: 6 additions & 1 deletion addon/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions addon/v1alpha1/zz_generated.swagger_doc_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 55ed983

Please sign in to comment.