Update rollout lib (#276) (#298)

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



Fix verify ci step missing. (#289)



: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.



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

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



---------



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



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

This reverts commit 9675ab7.

Signed-off-by: haoqing0110 <[email protected]>
Co-authored-by: Mohamed ElSerngawy <[email protected]>

Makefile

@@ -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
@@ -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

addon/v1alpha1/0000_02_addon.open-cluster-management.io_addondeploymentconfigs.crd.yaml

@@ -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

addon/v1alpha1/0000_03_addon.open-cluster-management.io_addontemplates.crd.yaml

@@ -10,6 +10,7 @@ spec:
     listKind: AddOnTemplateList
     plural: addontemplates
     singular: addontemplate
+  preserveUnknownFields: false
   scope: Cluster
   versions:
   - additionalPrinterColumns:

addon/v1alpha1/types_addondeploymentconfig.go

@@ -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