From 53536d56db375650aea9c6a6e48017ba01e4eb50 Mon Sep 17 00:00:00 2001 From: Howard Lau Date: Fri, 30 Oct 2020 06:57:02 +0000 Subject: [PATCH] fix name Signed-off-by: Howard Lau --- controllers/controller_filer_service.go | 12 ++++++------ controllers/controller_filer_statefulset.go | 8 ++++---- controllers/controller_master_service.go | 8 ++++---- controllers/controller_master_statefulset.go | 5 +++-- controllers/controller_volume_service.go | 4 ++-- controllers/controller_volume_statefulset.go | 6 +++--- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/controllers/controller_filer_service.go b/controllers/controller_filer_service.go index 35f8f55..a7b680f 100644 --- a/controllers/controller_filer_service.go +++ b/controllers/controller_filer_service.go @@ -25,19 +25,19 @@ func (r *SeaweedReconciler) createFilerPeerService(m *seaweedv1.Seaweed) *corev1 PublishNotReadyAddresses: true, Ports: []corev1.ServicePort{ { - Name: "swfs-filer", + Name: "filer-http", Protocol: corev1.Protocol("TCP"), Port: seaweedv1.FilerHTTPPort, TargetPort: intstr.FromInt(seaweedv1.FilerHTTPPort), }, { - Name: "swfs-filer-grpc", + Name: "filer-grpc", Protocol: corev1.Protocol("TCP"), Port: seaweedv1.FilerGRPCPort, TargetPort: intstr.FromInt(seaweedv1.FilerGRPCPort), }, { - Name: "swfs-s3", + Name: "filer-s3", Protocol: corev1.Protocol("TCP"), Port: seaweedv1.FilerS3Port, TargetPort: intstr.FromInt(seaweedv1.FilerS3Port), @@ -66,19 +66,19 @@ func (r *SeaweedReconciler) createFilerService(m *seaweedv1.Seaweed) *corev1.Ser PublishNotReadyAddresses: true, Ports: []corev1.ServicePort{ { - Name: "swfs-filer", + Name: "filer-http", Protocol: corev1.Protocol("TCP"), Port: seaweedv1.FilerHTTPPort, TargetPort: intstr.FromInt(seaweedv1.FilerHTTPPort), }, { - Name: "swfs-filer-grpc", + Name: "filer-grpc", Protocol: corev1.Protocol("TCP"), Port: seaweedv1.FilerGRPCPort, TargetPort: intstr.FromInt(seaweedv1.FilerGRPCPort), }, { - Name: "swfs-s3", + Name: "filer-s3", Protocol: corev1.Protocol("TCP"), Port: seaweedv1.FilerS3Port, TargetPort: intstr.FromInt(seaweedv1.FilerS3Port), diff --git a/controllers/controller_filer_statefulset.go b/controllers/controller_filer_statefulset.go index 95306b1..5de5557 100644 --- a/controllers/controller_filer_statefulset.go +++ b/controllers/controller_filer_statefulset.go @@ -43,7 +43,7 @@ func (r *SeaweedReconciler) createFilerStatefulSet(m *seaweedv1.Seaweed) *appsv1 } filerPodSpec.EnableServiceLinks = &enableServiceLinks filerPodSpec.Containers = []corev1.Container{{ - Name: "seaweedfs", + Name: "filer", Image: m.Spec.Image, ImagePullPolicy: m.BaseFilerSpec().ImagePullPolicy(), Env: append(m.BaseFilerSpec().Env(), kubernetesEnvVars...), @@ -55,15 +55,15 @@ func (r *SeaweedReconciler) createFilerStatefulSet(m *seaweedv1.Seaweed) *appsv1 Ports: []corev1.ContainerPort{ { ContainerPort: seaweedv1.FilerHTTPPort, - Name: "swfs-filer", + Name: "filer-http", }, { ContainerPort: seaweedv1.FilerGRPCPort, - Name: "swfs-filer-grpc", + Name: "filer-grpc", }, { ContainerPort: seaweedv1.FilerS3Port, - Name: "swfs-s3", + Name: "filer-s3", }, }, ReadinessProbe: &corev1.Probe{ diff --git a/controllers/controller_master_service.go b/controllers/controller_master_service.go index cba47ca..cd04c17 100644 --- a/controllers/controller_master_service.go +++ b/controllers/controller_master_service.go @@ -25,13 +25,13 @@ func (r *SeaweedReconciler) createMasterPeerService(m *seaweedv1.Seaweed) *corev PublishNotReadyAddresses: true, Ports: []corev1.ServicePort{ { - Name: "swfs-master", + Name: "master-http", Protocol: corev1.Protocol("TCP"), Port: seaweedv1.MasterHTTPPort, TargetPort: intstr.FromInt(seaweedv1.MasterHTTPPort), }, { - Name: "swfs-master-grpc", + Name: "master-grpc", Protocol: corev1.Protocol("TCP"), Port: seaweedv1.MasterGRPCPort, TargetPort: intstr.FromInt(seaweedv1.MasterGRPCPort), @@ -61,13 +61,13 @@ func (r *SeaweedReconciler) createMasterService(m *seaweedv1.Seaweed) *corev1.Se PublishNotReadyAddresses: true, Ports: []corev1.ServicePort{ { - Name: "swfs-master", + Name: "master-http", Protocol: corev1.Protocol("TCP"), Port: seaweedv1.MasterHTTPPort, TargetPort: intstr.FromInt(seaweedv1.MasterHTTPPort), }, { - Name: "swfs-master-grpc", + Name: "master-grpc", Protocol: corev1.Protocol("TCP"), Port: seaweedv1.MasterGRPCPort, TargetPort: intstr.FromInt(seaweedv1.MasterGRPCPort), diff --git a/controllers/controller_master_statefulset.go b/controllers/controller_master_statefulset.go index 1d8b3ad..498e4c1 100644 --- a/controllers/controller_master_statefulset.go +++ b/controllers/controller_master_statefulset.go @@ -57,7 +57,7 @@ func (r *SeaweedReconciler) createMasterStatefulSet(m *seaweedv1.Seaweed) *appsv } masterPodSpec.EnableServiceLinks = &enableServiceLinks masterPodSpec.Containers = []corev1.Container{{ - Name: "seaweedfs", + Name: "master", Image: m.Spec.Image, ImagePullPolicy: m.BaseMasterSpec().ImagePullPolicy(), Env: append(m.BaseMasterSpec().Env(), kubernetesEnvVars...), @@ -76,10 +76,11 @@ func (r *SeaweedReconciler) createMasterStatefulSet(m *seaweedv1.Seaweed) *appsv Ports: []corev1.ContainerPort{ { ContainerPort: seaweedv1.MasterHTTPPort, - Name: "swfs-master", + Name: "master-http", }, { ContainerPort: seaweedv1.MasterGRPCPort, + Name: "master-grpc", }, }, ReadinessProbe: &corev1.Probe{ diff --git a/controllers/controller_volume_service.go b/controllers/controller_volume_service.go index b29c0e8..7b4985b 100644 --- a/controllers/controller_volume_service.go +++ b/controllers/controller_volume_service.go @@ -58,13 +58,13 @@ func (r *SeaweedReconciler) createVolumeServerService(m *seaweedv1.Seaweed) *cor PublishNotReadyAddresses: true, Ports: []corev1.ServicePort{ { - Name: "swfs-volume", + Name: "volume", Protocol: corev1.Protocol("TCP"), Port: seaweedv1.VolumeHTTPPort, TargetPort: intstr.FromInt(seaweedv1.VolumeHTTPPort), }, { - Name: "swfs-volume-grpc", + Name: "volume-grpc", Protocol: corev1.Protocol("TCP"), Port: seaweedv1.VolumeGRPCPort, TargetPort: intstr.FromInt(seaweedv1.VolumeGRPCPort), diff --git a/controllers/controller_volume_statefulset.go b/controllers/controller_volume_statefulset.go index 70fa7a4..e0d4cc5 100644 --- a/controllers/controller_volume_statefulset.go +++ b/controllers/controller_volume_statefulset.go @@ -74,7 +74,7 @@ func (r *SeaweedReconciler) createVolumeServerStatefulSet(m *seaweedv1.Seaweed) volumePodSpec := m.BaseVolumeSpec().BuildPodSpec() volumePodSpec.EnableServiceLinks = &enableServiceLinks volumePodSpec.Containers = []corev1.Container{{ - Name: "seaweedfs", + Name: "volume", Image: m.Spec.Image, ImagePullPolicy: m.BaseVolumeSpec().ImagePullPolicy(), Env: append(m.BaseVolumeSpec().Env(), kubernetesEnvVars...), @@ -86,11 +86,11 @@ func (r *SeaweedReconciler) createVolumeServerStatefulSet(m *seaweedv1.Seaweed) Ports: []corev1.ContainerPort{ { ContainerPort: seaweedv1.VolumeHTTPPort, - Name: "swfs-volume", + Name: "volume-http", }, { ContainerPort: seaweedv1.VolumeGRPCPort, - Name: "swfs-volume-grpc", + Name: "volume-grpc", }, }, ReadinessProbe: &corev1.Probe{