Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename labels from sigs.k8s.io to machine.openshift.io #116

Merged
merged 1 commit into from
Feb 27, 2019
Merged

Rename labels from sigs.k8s.io to machine.openshift.io #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions examples/machine-set.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ metadata:
name: worker-example-machine-set
namespace: test
labels:
sigs.k8s.io/cluster-api-cluster: tb-asg-35
sigs.k8s.io/cluster-api-machine-role: infra
sigs.k8s.io/cluster-api-machine-type: worker
machine.openshift.io/cluster-api-cluster: tb-asg-35
machine.openshift.io/cluster-api-machine-role: infra
machine.openshift.io/cluster-api-machine-type: worker
spec:
replicas: 2
selector:
matchLabels:
sigs.k8s.io/cluster-api-machineset: worker-example-machine-set
sigs.k8s.io/cluster-api-cluster: tb-asg-35
sigs.k8s.io/cluster-api-machine-role: infra
sigs.k8s.io/cluster-api-machine-type: worker
machine.openshift.io/cluster-api-machineset: worker-example-machine-set
machine.openshift.io/cluster-api-cluster: tb-asg-35
machine.openshift.io/cluster-api-machine-role: infra
machine.openshift.io/cluster-api-machine-type: worker
template:
metadata:
labels:
sigs.k8s.io/cluster-api-machineset: worker-example-machine-set
sigs.k8s.io/cluster-api-cluster: tb-asg-35
sigs.k8s.io/cluster-api-machine-role: infra
sigs.k8s.io/cluster-api-machine-type: worker
machine.openshift.io/cluster-api-machineset: worker-example-machine-set
machine.openshift.io/cluster-api-cluster: tb-asg-35
machine.openshift.io/cluster-api-machine-role: infra
machine.openshift.io/cluster-api-machine-type: worker
spec:
providerConfig:
value:
Expand Down
6 changes: 3 additions & 3 deletions examples/machine-with-full-paths.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
name: worker-example
namespace: test
labels:
sigs.k8s.io/cluster-api-cluster: cluster-name
sigs.k8s.io/cluster-api-machine-role: infra
sigs.k8s.io/cluster-api-machine-type: worker
machine.openshift.io/cluster-api-cluster: cluster-name
machine.openshift.io/cluster-api-machine-role: infra
machine.openshift.io/cluster-api-machine-type: worker
spec:
providerConfig:
value:
Expand Down
6 changes: 3 additions & 3 deletions examples/machine-with-userdata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
namespace: test
generateName: vs-worker-
labels:
sigs.k8s.io/cluster-api-cluster: tb-asg-35
sigs.k8s.io/cluster-api-machine-role: infra
sigs.k8s.io/cluster-api-machine-type: worker
machine.openshift.io/cluster-api-cluster: tb-asg-35
machine.openshift.io/cluster-api-machine-role: infra
machine.openshift.io/cluster-api-machine-type: worker
spec:
providerConfig:
value:
Expand Down
6 changes: 3 additions & 3 deletions examples/machine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
namespace: test
generateName: vs-worker-
labels:
sigs.k8s.io/cluster-api-cluster: tb-asg-35
sigs.k8s.io/cluster-api-machine-role: infra
sigs.k8s.io/cluster-api-machine-type: worker
machine.openshift.io/cluster-api-cluster: tb-asg-35
machine.openshift.io/cluster-api-machine-role: infra
machine.openshift.io/cluster-api-machine-type: worker
spec:
providerConfig:
value:
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/libvirtproviderconfig/v1beta1/libvirtmachineproviderconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
const (
// ClusterIDLabel is the label that a machineset must have to identify the
// cluster to which it belongs.
ClusterIDLabel = "sigs.k8s.io/cluster-api-cluster"
MachineRoleLabel = "sigs.k8s.io/cluster-api-machine-role"
MachineTypeLabel = "sigs.k8s.io/cluster-api-machine-type"
ClusterIDLabel = "machine.openshift.io/cluster-api-cluster"
MachineRoleLabel = "machine.openshift.io/cluster-api-machine-role"
MachineTypeLabel = "machine.openshift.io/cluster-api-machine-type"
)

// LibvirtMachineProviderConfig is the type that will be embedded in a Machine.Spec.ProviderSpec field
Expand Down