Fix implicit aliasing nested maps (#319)

* Fix implicit aliasing issue in nested maps
oracle · Aug 18, 2023 · 2033e63 · 2033e63
1 parent 84976e0
commit 2033e63
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -369,7 +369,7 @@ envsubst: $(ENVSUBST) ## Build a local copy of envsubst.
 kubectl: $(KUBECTL) ## Build a local copy of kubectl.
 
 $(CONTROLLER_GEN): ## Download controller-gen locally if necessary.
-	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) v0.10.0
+	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) v0.13.0
 
 $(CONVERSION_GEN): ## Download controller-gen locally if necessary.
 	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) k8s.io/code-generator/cmd/conversion-gen $(CONVERSION_GEN_BIN) v0.23.1

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/api/v1beta2/zz_generated.deepcopy.go b/api/v1beta2/zz_generated.deepcopy.go
diff --git a/cloud/scope/clients.go b/cloud/scope/clients.go
@@ -17,7 +17,6 @@ limitations under the License.
 package scope
 
 import (
-	"crypto/tls"
 	"crypto/x509"
 	"net/http"
 	"sync"
@@ -416,9 +415,9 @@ func (c *ClientProvider) setCerts(client *http.Client) error {
 	if tr.TLSClientConfig != nil {
 		tr.TLSClientConfig.RootCAs = c.certOverride
 	} else {
-		tr.TLSClientConfig = &tls.Config{
-			RootCAs: c.certOverride,
-		}
+		// If TLS client config is not set, we should error out. else the default values will
+		// be used which will be insecure
+		return errors.New("TLSClientConfig is not set on the client")
 	}
 	client.Transport = tr
 

diff --git a/exp/api/v1beta1/zz_generated.deepcopy.go b/exp/api/v1beta1/zz_generated.deepcopy.go
diff --git a/exp/api/v1beta2/zz_generated.deepcopy.go b/exp/api/v1beta2/zz_generated.deepcopy.go