Merge pull request #126 from cschwede/fix-labels

Fix service labels

pkg/swiftproxy/const.go

@@ -0,0 +1,21 @@
+/*
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package swiftproxy
+
+const (
+	// ComponentName -
+	ComponentName = "swift-proxy"
+)

pkg/swiftproxy/funcs.go

@@ -15,6 +15,14 @@ limitations under the License.
 
 package swiftproxy
 
+import (
+	"github.com/openstack-k8s-operators/lib-common/modules/common"
+	"github.com/openstack-k8s-operators/swift-operator/pkg/swift"
+)
+
 func Labels() map[string]string {
-	return map[string]string{"app.kubernetes.io/name": "SwiftProxy"}
+	return map[string]string{
+		common.AppSelector:       swift.ServiceName,
+		common.ComponentSelector: ComponentName,
+	}
 }

pkg/swiftring/const.go

@@ -0,0 +1,21 @@
+/*
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package swiftring
+
+const (
+	// ComponentName -
+	ComponentName = "swift-ring"
+)

pkg/swiftring/funcs.go

@@ -15,6 +15,14 @@ limitations under the License.
 
 package swiftring
 
+import (
+	"github.com/openstack-k8s-operators/lib-common/modules/common"
+	"github.com/openstack-k8s-operators/swift-operator/pkg/swift"
+)
+
 func Labels() map[string]string {
-	return map[string]string{"batch.kubernetes.io/job-name": "SwiftRing"}
+	return map[string]string{
+		common.AppSelector:       swift.ServiceName,
+		common.ComponentSelector: ComponentName,
+	}
 }

pkg/swiftstorage/const.go

@@ -0,0 +1,21 @@
+/*
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package swiftstorage
+
+const (
+	// ComponentName -
+	ComponentName = "swift-storage"
+)

pkg/swiftstorage/funcs.go

@@ -25,6 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/types"
 
+	"github.com/openstack-k8s-operators/lib-common/modules/common"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/helper"
 
 	swiftv1beta1 "github.com/openstack-k8s-operators/swift-operator/api/v1beta1"
@@ -59,5 +60,8 @@ func DeviceList(ctx context.Context, h *helper.Helper, instance *swiftv1beta1.Sw
 }
 
 func Labels() map[string]string {
-	return map[string]string{"app.kubernetes.io/name": "SwiftStorage"}
+	return map[string]string{
+		common.AppSelector:       swift.ServiceName,
+		common.ComponentSelector: ComponentName,
+	}
 }