diff --git a/chart/dapr-shared/templates/_daemondeployshared.yaml b/chart/dapr-shared/templates/_daemondeployshared.yaml index 28d5446..5168e3c 100644 --- a/chart/dapr-shared/templates/_daemondeployshared.yaml +++ b/chart/dapr-shared/templates/_daemondeployshared.yaml @@ -75,16 +75,6 @@ configMapKeyRef: name: {{ .Release.Name }}-shared-cm key: dapr-trust-anchors - - name: DAPR_CERT_CHAIN - valueFrom: - configMapKeyRef: - name: {{ .Release.Name }}-shared-cm - key: dapr-cert-chain - - name: DAPR_CERT_KEY - valueFrom: - configMapKeyRef: - name: {{ .Release.Name }}-shared-cm - key: dapr-cert-key - name: DAPR_CONTROL_PLANE_NAMESPACE value: {{ default "dapr-system" .Values.shared.controlPlane.namespace }} - name: DAPR_API_TOKEN diff --git a/cmd/shared-init/main.go b/cmd/shared-init/main.go index cc54f1e..d8638f9 100644 --- a/cmd/shared-init/main.go +++ b/cmd/shared-init/main.go @@ -16,14 +16,12 @@ import ( ) const ( - daprTrustAnchorsConfigMapKey string = "dapr-trust-anchors" - daprTrustCertChainConfigMapKey string = "dapr-cert-chain" - daprTrustCertKeyConfigMapKey string = "dapr-cert-key" - namespaceDefault string = "default" - DaprSystemNamespace string = "dapr-system" - DaprControlPlaneNamespace string = "DAPR_CONTROL_PLANE_NAMESPACE" - DaprSharedInstanceNamespace string = "DAPR_SHARED_INSTANCE_NAMESPACE" - namespaceFilePath = "/var/run/secrets/kubernetes.io/serviceaccount/namespace" + daprTrustAnchorsConfigMapKey string = "dapr-trust-anchors" + namespaceDefault string = "default" + DaprSystemNamespace string = "dapr-system" + DaprControlPlaneNamespace string = "DAPR_CONTROL_PLANE_NAMESPACE" + DaprSharedInstanceNamespace string = "DAPR_SHARED_INSTANCE_NAMESPACE" + namespaceFilePath = "/var/run/secrets/kubernetes.io/serviceaccount/namespace" ) var configMapName string @@ -98,7 +96,7 @@ func InitHandler() { c := NewDaprSidecarClient(kubeClient) - rootCert, certChain, certKey := c.Get(ctx, LookupEnvOrString(DaprControlPlaneNamespace, DaprSystemNamespace)) + rootCert, _, _ := c.Get(ctx, LookupEnvOrString(DaprControlPlaneNamespace, DaprSystemNamespace)) namespace := getNamespace() configMap := &corev1.ConfigMap{ @@ -107,9 +105,7 @@ func InitHandler() { Namespace: namespace, }, Data: map[string]string{ - daprTrustAnchorsConfigMapKey: rootCert, - daprTrustCertChainConfigMapKey: certChain, - daprTrustCertKeyConfigMapKey: certKey, + daprTrustAnchorsConfigMapKey: rootCert, }, }