Skip to content

Commit 283aef8

Browse files
committed
chore: remove unncessary duplicate label for managed by
Signed-off-by: Jan Larwig <jan.larwig@digits.schwarz>
1 parent d5d3cc7 commit 283aef8

3 files changed

Lines changed: 10 additions & 19 deletions

File tree

‎cloud/sdk_client.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,6 @@ func clusterServerSelectorFromTags(tags map[string]string) map[string]string {
10551055
"cluster.x-k8s.io/cluster-name",
10561056
"cluster.x-k8s.io/cluster-namespace",
10571057
"cluster.x-k8s.io/managed-by",
1058-
"cluster-api-provider-stackit/managed",
10591058
} {
10601059
if value := tags[key]; value != "" {
10611060
selector[key] = value

‎util/tags.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,15 @@ const (
2020
LabelMachineName = "cluster.x-k8s.io/machine-name"
2121
LabelMachineUID = "cluster.x-k8s.io/machine-uid"
2222
LabelManagedBy = "cluster.x-k8s.io/managed-by"
23-
LabelProviderManaged = "cluster-api-provider-stackit/managed"
2423
LabelResourceRole = "cluster-api-provider-stackit/resource-role"
2524
LabelE2E = "cluster-api-provider-stackit/e2e"
2625
LabelTestID = "cluster-api-provider-stackit/test-id"
2726

2827
// ManagedByValue identifies resources managed by this provider.
29-
ManagedByValue = "cluster-api-provider-stackit"
30-
ProviderManagedValue = "true"
31-
ResourceRoleBastion = "bastion"
32-
ResourceRoleNodeSSH = "node-ssh"
33-
E2EValue = "true"
28+
ManagedByValue = "cluster-api-provider-stackit"
29+
ResourceRoleBastion = "bastion"
30+
ResourceRoleNodeSSH = "node-ssh"
31+
E2EValue = "true"
3432
)
3533

3634
// ClusterTags returns the canonical tags applied to cluster-wide cloud
@@ -41,7 +39,6 @@ func ClusterTags(clusterName, clusterNamespace string, additionalLabels map[stri
4139
LabelClusterName: clusterName,
4240
LabelClusterNamespace: clusterNamespace,
4341
LabelManagedBy: ManagedByValue,
44-
LabelProviderManaged: ProviderManagedValue,
4542
}
4643
for k, v := range additionalLabels {
4744
if _, isReserved := out[k]; isReserved {
@@ -65,7 +62,6 @@ func MachineTags(
6562
LabelMachineName: machineName,
6663
LabelMachineUID: machineUID,
6764
LabelManagedBy: ManagedByValue,
68-
LabelProviderManaged: ProviderManagedValue,
6965
}
7066
for k, v := range additionalLabels {
7167
if _, isReserved := out[k]; isReserved {

‎util/tags_test.go‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,31 @@ func TestClusterTags(t *testing.T) {
1818
LabelClusterName: "override",
1919
LabelClusterNamespace: "override",
2020
LabelManagedBy: "override",
21-
LabelProviderManaged: "override",
2221
"another.example": "value",
2322
})
2423

2524
assertTag(t, got, LabelClusterName, "cluster-a")
2625
assertTag(t, got, LabelClusterNamespace, "default")
2726
assertTag(t, got, LabelManagedBy, ManagedByValue)
28-
assertTag(t, got, LabelProviderManaged, ProviderManagedValue)
2927
assertTag(t, got, "environment", "dev")
3028
assertTag(t, got, "another.example", "value")
3129
}
3230

3331
func TestMachineTags(t *testing.T) {
3432
got := MachineTags("cluster-a", "default", "machine-a", "uid-a", map[string]string{
35-
"environment": "dev",
36-
LabelMachineName: "override",
37-
LabelMachineUID: "override",
38-
LabelManagedBy: "override",
39-
LabelProviderManaged: "override",
40-
LabelClusterName: "override",
41-
"another.example": "value",
33+
"environment": "dev",
34+
LabelMachineName: "override",
35+
LabelMachineUID: "override",
36+
LabelManagedBy: "override",
37+
LabelClusterName: "override",
38+
"another.example": "value",
4239
})
4340

4441
assertTag(t, got, LabelClusterName, "cluster-a")
4542
assertTag(t, got, LabelClusterNamespace, "default")
4643
assertTag(t, got, LabelMachineName, "machine-a")
4744
assertTag(t, got, LabelMachineUID, "uid-a")
4845
assertTag(t, got, LabelManagedBy, ManagedByValue)
49-
assertTag(t, got, LabelProviderManaged, ProviderManagedValue)
5046
assertTag(t, got, "environment", "dev")
5147
assertTag(t, got, "another.example", "value")
5248
}

0 commit comments

Comments
 (0)