From 1d7c26f23b1d7ca7daceed66bc741b48c99994cd Mon Sep 17 00:00:00 2001 From: Anton Skriptsov Date: Fri, 13 Dec 2019 10:40:25 -0800 Subject: [PATCH] edgefs: Fix restapi image selection Signed-off-by: Anton Skriptsov --- pkg/operator/edgefs/s3/s3.go | 21 ++++++--------------- pkg/operator/edgefs/s3x/s3x.go | 14 +++----------- pkg/operator/edgefs/swift/swift.go | 15 +++------------ 3 files changed, 12 insertions(+), 38 deletions(-) diff --git a/pkg/operator/edgefs/s3/s3.go b/pkg/operator/edgefs/s3/s3.go index f210af9ff..f31053748 100644 --- a/pkg/operator/edgefs/s3/s3.go +++ b/pkg/operator/edgefs/s3/s3.go @@ -19,7 +19,6 @@ package s3 import ( "fmt" - "strings" edgefsv1 "github.com/rook/rook/pkg/apis/edgefs.rook.io/v1" "github.com/rook/rook/pkg/clusterd" @@ -35,7 +34,7 @@ const ( /* Volumes definitions */ serviceAccountName = "rook-edgefs-cluster" - defaultS3Image = "edgefs/edgefs-restapi" + s3ImagePostfix = "restapi" sslCertVolumeName = "ssl-cert-volume" sslMountPath = "/opt/nedge/etc/ssl/" dataVolumeName = "edgefs-datadir" @@ -78,30 +77,21 @@ func (c *S3Controller) CreateOrUpdate(s edgefsv1.S3, update bool, ownerRefs []me } imageArgs := "s3" - var rookImage string + rookImagePostfix := "" if s.Spec.S3Type == "" { - rookImage = defaultS3Image + rookImagePostfix = s3ImagePostfix } else if s.Spec.S3Type == "s3" || s.Spec.S3Type == "s3s" { // all rest APIs coming from edgefs-restapi image, that // includes mgmt, s3, s3s and swift - rookImage = defaultS3Image + rookImagePostfix = s3ImagePostfix imageArgs = s.Spec.S3Type } else if s.Spec.S3Type == "s3g" { // built-in s3 version, limited and experimental coming // as a part of core edgefs image - rookImage = c.rookImage } else { return fmt.Errorf("invalid S3 service type %s", s.Spec.S3Type) } - var rookImageVer string - rookImageComponents := strings.Split(c.rookImage, ":") - if len(rookImageComponents) == 2 { - rookImageVer = rookImageComponents[1] - } else { - rookImageVer = "latest" - } - // check if S3 service already exists exists, err := serviceExists(c.context, s) if err == nil && exists { @@ -113,7 +103,7 @@ func (c *S3Controller) CreateOrUpdate(s edgefsv1.S3, update bool, ownerRefs []me } // start the deployment - deployment := c.makeDeployment(s.Name, s.Namespace, rookImage+":"+rookImageVer, imageArgs, s.Spec) + deployment := c.makeDeployment(s.Name, s.Namespace, edgefsv1.GetModifiedRookImagePath(c.rookImage, rookImagePostfix), imageArgs, s.Spec) if _, err := c.context.Clientset.AppsV1().Deployments(s.Namespace).Create(deployment); err != nil { if !errors.IsAlreadyExists(err) { return fmt.Errorf("failed to create %s deployment. %+v", appName, err) @@ -141,6 +131,7 @@ func (c *S3Controller) CreateOrUpdate(s edgefsv1.S3, update bool, ownerRefs []me return nil } +// makeS3Service creates k8s service func (c *S3Controller) makeS3Service(name, svcname, namespace string, s3Spec edgefsv1.S3Spec) *v1.Service { labels := getLabels(name, svcname, namespace) httpPort := v1.ServicePort{Name: "port", Port: int32(s3Spec.Port), Protocol: v1.ProtocolTCP} diff --git a/pkg/operator/edgefs/s3x/s3x.go b/pkg/operator/edgefs/s3x/s3x.go index de8df81a2..545c35057 100644 --- a/pkg/operator/edgefs/s3x/s3x.go +++ b/pkg/operator/edgefs/s3x/s3x.go @@ -19,7 +19,6 @@ package s3x import ( "fmt" - "strings" edgefsv1 "github.com/rook/rook/pkg/apis/edgefs.rook.io/v1" "github.com/rook/rook/pkg/clusterd" @@ -36,7 +35,7 @@ const ( /* Volumes definitions */ serviceAccountName = "rook-edgefs-cluster" sslCertVolumeName = "ssl-cert-volume" - defaultS3Image = "edgefs/edgefs-restapi" + s3ImagePostfix = "restapi" sslMountPath = "/opt/nedge/etc/ssl/" dataVolumeName = "edgefs-datadir" stateVolumeFolder = ".state" @@ -202,21 +201,14 @@ func (c *S3XController) makeDeployment(svcname, namespace, rookImage string, s3x }) } - var rookImageVer string - rookImageComponents := strings.Split(c.rookImage, ":") - if len(rookImageComponents) == 2 { - rookImageVer = rookImageComponents[1] - } else { - rookImageVer = "latest" - } - podSpec := v1.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Name: name, Labels: getLabels(name, svcname, namespace), }, Spec: v1.PodSpec{ - Containers: []v1.Container{c.s3xContainer(svcname, name, rookImage, s3xSpec), c.s3ProxyContainer(svcname, "s3-proxy", defaultS3Image+":"+rookImageVer, "s3", s3xSpec)}, + Containers: []v1.Container{c.s3xContainer(svcname, name, rookImage, s3xSpec), + c.s3ProxyContainer(svcname, "s3-proxy", edgefsv1.GetModifiedRookImagePath(rookImage, s3ImagePostfix), "s3", s3xSpec)}, RestartPolicy: v1.RestartPolicyAlways, Volumes: volumes, HostIPC: true, diff --git a/pkg/operator/edgefs/swift/swift.go b/pkg/operator/edgefs/swift/swift.go index 4ba8f4b85..562f77626 100644 --- a/pkg/operator/edgefs/swift/swift.go +++ b/pkg/operator/edgefs/swift/swift.go @@ -19,7 +19,6 @@ package swift import ( "fmt" - "strings" edgefsv1 "github.com/rook/rook/pkg/apis/edgefs.rook.io/v1" "github.com/rook/rook/pkg/clusterd" @@ -35,7 +34,7 @@ const ( /* Volumes definitions */ serviceAccountName = "rook-edgefs-cluster" - defaultSWIFTImage = "edgefs/edgefs-restapi" + swiftImagePostfix = "restapi" sslCertVolumeName = "ssl-cert-volume" sslMountPath = "/opt/nedge/etc/ssl/" dataVolumeName = "edgefs-datadir" @@ -80,15 +79,7 @@ func (c *SWIFTController) CreateOrUpdate(s edgefsv1.SWIFT, update bool, ownerRef // all rest APIs coming from edgefs-restapi image, that // includes mgmt, s3, s3s and swift imageArgs := "swift" - rookImage := defaultSWIFTImage - - var rookImageVer string - rookImageComponents := strings.Split(c.rookImage, ":") - if len(rookImageComponents) == 2 { - rookImageVer = rookImageComponents[1] - } else { - rookImageVer = "latest" - } + rookImage := edgefsv1.GetModifiedRookImagePath(c.rookImage, swiftImagePostfix) // check if SWIFT service already exists exists, err := serviceExists(c.context, s) @@ -101,7 +92,7 @@ func (c *SWIFTController) CreateOrUpdate(s edgefsv1.SWIFT, update bool, ownerRef } // start the deployment - deployment := c.makeDeployment(s.Name, s.Namespace, rookImage+":"+rookImageVer, imageArgs, s.Spec) + deployment := c.makeDeployment(s.Name, s.Namespace, rookImage, imageArgs, s.Spec) if _, err := c.context.Clientset.AppsV1().Deployments(s.Namespace).Create(deployment); err != nil { if !errors.IsAlreadyExists(err) { return fmt.Errorf("failed to create %s deployment. %+v", appName, err)