fix: Cert hosts for JetStream EventBus (#2827)

Signed-off-by: Derek Wang <whynowy@gmail.com>
argoproj · Nov 28, 2023 · ec96ecd · ec96ecd
1 parent 2721ca9
commit ec96ecd
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/api/event-bus.html b/api/event-bus.html
diff --git a/api/event-bus.md b/api/event-bus.md
diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json
@@ -473,7 +473,7 @@
           "description": "ReloaderContainerTemplate contains customized spec for config reloader container"
         },
         "replicas": {
-          "description": "Redis StatefulSet size",
+          "description": "JetStream StatefulSet size",
           "format": "int32",
           "type": "integer"
         },

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/controllers/eventbus/installer/jetstream.go b/controllers/eventbus/installer/jetstream.go
@@ -557,7 +557,10 @@ func (r *jetStreamInstaller) createSecrets(ctx context.Context) error {
 		}
 
 		// Generate TLS self signed certificate for Jetstream cluster nodes: includes TLS private key, certificate, and CA certificate
-		clusterNodeHosts := []string{fmt.Sprintf("*.%s.%s.svc", generateJetStreamServiceName(r.eventBus), r.eventBus.Namespace)}
+		clusterNodeHosts := []string{
+			fmt.Sprintf("*.%s.%s.svc.cluster.local", generateJetStreamServiceName(r.eventBus), r.eventBus.Namespace),
+			fmt.Sprintf("*.%s.%s.svc", generateJetStreamServiceName(r.eventBus), r.eventBus.Namespace),
+		}
 		r.logger.Infof("cluster node hosts: %+v", clusterNodeHosts)
 		clusterKeyPEM, clusterCertPEM, clusterCACertPEM, err := tls.CreateCerts(certOrg, clusterNodeHosts, time.Now().Add(10*365*24*time.Hour), true, true) // expires in 10 years
 		if err != nil {

diff --git a/pkg/apis/eventbus/v1alpha1/generated.proto b/pkg/apis/eventbus/v1alpha1/generated.proto
diff --git a/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go b/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go
@@ -9,7 +9,7 @@ import (
 type JetStreamBus struct {
 	// JetStream version, such as "2.7.3"
 	Version string `json:"version,omitempty" protobuf:"bytes,1,opt,name=version"`
-	// Redis StatefulSet size
+	// JetStream StatefulSet size
 	// +kubebuilder:default=3
 	Replicas *int32 `json:"replicas,omitempty" protobuf:"varint,2,opt,name=replicas"`
 	// ContainerTemplate contains customized spec for Nats JetStream container

diff --git a/pkg/apis/eventbus/v1alpha1/openapi_generated.go b/pkg/apis/eventbus/v1alpha1/openapi_generated.go