Merge branch 'master' into improve-rbac

litmuschaos · May 3, 2024 · e6ef6ab · e6ef6ab
2 parents 8ab5127 + e15d670
commit e6ef6ab
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/chaoscenter/event-tracker/main.go b/chaoscenter/event-tracker/main.go
@@ -111,9 +111,12 @@ func main() {
 		if err != nil {
 			logrus.Fatalf("failed to parse custom tls cert %v", err)
 		}
-		caCertPool := x509.NewCertPool()
-		caCertPool.AppendCertsFromPEM(cert)
-		http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{RootCAs: caCertPool}
+		rootCerts, err := x509.SystemCertPool()
+		if err != nil {
+			logrus.Fatalf("Failed to read system cert pool %v", err)
+		}
+		rootCerts.AppendCertsFromPEM(cert)
+		http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{RootCAs: rootCerts}
 	}
 
 	var (

diff --git a/chaoscenter/subscriber/subscriber.go b/chaoscenter/subscriber/subscriber.go
@@ -81,10 +81,13 @@ func init() {
 		if err != nil {
 			logrus.Fatalf("Failed to parse custom tls cert %v", err)
 		}
-		caCertPool := x509.NewCertPool()
-		caCertPool.AppendCertsFromPEM(cert)
-		http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{RootCAs: caCertPool}
-		websocket.DefaultDialer.TLSClientConfig = &tls.Config{RootCAs: caCertPool}
+		rootCerts, err := x509.SystemCertPool()
+		if err != nil {
+			logrus.Fatalf("Failed to read system cert pool %v", err)
+		}
+		rootCerts.AppendCertsFromPEM(cert)
+		http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{RootCAs: rootCerts}
+		websocket.DefaultDialer.TLSClientConfig = &tls.Config{RootCAs: rootCerts}
 	}
 
 	k8s.KubeConfig = flag.String("kubeconfig", "", "absolute path to the kubeconfig file")

diff --git a/chaoscenter/web/src/models/chaosInfrastructure.ts b/chaoscenter/web/src/models/chaosInfrastructure.ts
@@ -118,7 +118,7 @@ export const initialValues: InitialValueProps = {
 };
 
 export const kubernetesChaosInfrastructureCRDsEndpoint =
-  'https://raw.githubusercontent.com/litmuschaos/litmus/master/mkdocs/docs/3.0.0-beta10/litmus-portal-crds-3.0.0-beta10.yml';
+  'https://raw.githubusercontent.com/litmuschaos/litmus/master/mkdocs/docs/3.6.1/litmus-portal-crds-3.6.1.yml';
 
 type InfrastructurePlatformNameType = 'Kubernetes';