Merge pull request #7336 from SaravanaStorageNetwork/fix_s3_service_to_s3_pod

Automatic merge from submit-queue.

Fix the gluster-s3 pod label used in gluster-s3 service.

roles/openshift_storage_glusterfs/files/v3.10/gluster-s3-template.yml

@@ -23,7 +23,7 @@ objects:
       port: 8080
       targetPort: 8080
     selector:
-      glusterfs: s3-pod
+      glusterfs: s3-${CLUSTER_NAME}-${S3_ACCOUNT}-pod
     type: ClusterIP
     sessionAffinity: None
   status:

roles/openshift_storage_glusterfs/files/v3.6/gluster-s3-template.yml

@@ -23,7 +23,7 @@ objects:
       port: 8080
       targetPort: 8080
     selector:
-      glusterfs: s3-pod
+      glusterfs: s3-${CLUSTER_NAME}-${S3_ACCOUNT}-pod
     type: ClusterIP
     sessionAffinity: None
   status:

roles/openshift_storage_glusterfs/files/v3.7/gluster-s3-template.yml

@@ -23,7 +23,7 @@ objects:
       port: 8080
       targetPort: 8080
     selector:
-      glusterfs: s3-pod
+      glusterfs: s3-${CLUSTER_NAME}-${S3_ACCOUNT}-pod
     type: ClusterIP
     sessionAffinity: None
   status:

roles/openshift_storage_glusterfs/files/v3.8/gluster-s3-template.yml

@@ -23,7 +23,7 @@ objects:
       port: 8080
       targetPort: 8080
     selector:
-      glusterfs: s3-pod
+      glusterfs: s3-${CLUSTER_NAME}-${S3_ACCOUNT}-pod
     type: ClusterIP
     sessionAffinity: None
   status:

roles/openshift_storage_glusterfs/files/v3.9/gluster-s3-template.yml

@@ -23,7 +23,7 @@ objects:
       port: 8080
       targetPort: 8080
     selector:
-      glusterfs: s3-pod
+      glusterfs: s3-${CLUSTER_NAME}-${S3_ACCOUNT}-pod
     type: ClusterIP
     sessionAffinity: None
   status: