Remove duplicated volume

Author: aledbf

install/installer/pkg/components/cluster/certmanager.go

@@ -5,6 +5,7 @@
 package cluster
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
@@ -19,7 +20,7 @@ import (
 
 func certmanager(ctx *common.RenderContext) ([]runtime.Object, error) {
 	issuerName := "gitpod-self-signed-issuer"
-	secretCAName := "gitpod-identity-trust-roots"
+	secretCAName := "gitpod-identity-trust-root"
 
 	return []runtime.Object{
 		// Define a self-signed issuer so we can generate a CA
@@ -89,7 +90,7 @@ func certmanager(ctx *common.RenderContext) ([]runtime.Object, error) {
 				IsCA:       true,
 				Duration:   &metav1.Duration{Duration: time.Duration(2190 * time.Hour)}, // 90 days
 				CommonName: "ca.gitpod.cluster.local",
-				SecretName: secretCAName,
+				SecretName: fmt.Sprintf("%v-intermediate", secretCAName),
 				PrivateKey: &v1.CertificatePrivateKey{
 					Algorithm: v1.ECDSAKeyAlgorithm,
 					Size:      256,

install/installer/pkg/components/registry-facade/daemonset.go

@@ -224,6 +224,12 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
 									Name:      name,
 									MountPath: "/mnt/pull-secret",
 								},
+								{
+									Name:      "ca-certificate",
+									MountPath: "/usr/local/share/ca-certificates/gitpod-ca.crt",
+									SubPath:   "ca.crt",
+									ReadOnly:  true,
+								},
 								common.CAVolumeMount(),
 							},
 							volumeMounts...,
@@ -288,10 +294,11 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
 							}},
 						},
 						{
-							Name: "ws-manager-client-tls-certs",
+
+							Name: "ca-certificate",
 							VolumeSource: corev1.VolumeSource{
 								Secret: &corev1.SecretVolumeSource{
-									SecretName: wsmanager.TLSSecretNameClient,
+									SecretName: "gitpod-identity-trust-root",
 								},
 							},
 						},