Skip to content

Commit

Permalink
Update machine API group and version
Browse files Browse the repository at this point in the history
  • Loading branch information
spadgett committed Feb 1, 2019
1 parent e2e73d6 commit 3e37cd6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
13 changes: 6 additions & 7 deletions frontend/public/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -818,13 +818,12 @@ export const APIServiceModel: K8sKind = {
};

// Cluster API resources
// https://github.com/kubernetes-sigs/cluster-api
export const MachineModel: K8sKind = {
label: 'Machine',
labelPlural: 'Machines',
apiVersion: 'v1alpha1',
apiVersion: 'v1beta1',
path: 'machines',
apiGroup: 'cluster.k8s.io',
apiGroup: 'machine.openshift.io',
plural: 'machines',
abbr: 'M',
namespaced: true,
Expand All @@ -836,9 +835,9 @@ export const MachineModel: K8sKind = {
export const MachineSetModel: K8sKind = {
label: 'Machine Set',
labelPlural: 'Machine Sets',
apiVersion: 'v1alpha1',
apiVersion: 'v1beta1',
path: 'machinesets',
apiGroup: 'cluster.k8s.io',
apiGroup: 'machine.openshift.io',
plural: 'machinesets',
abbr: 'MS',
namespaced: true,
Expand All @@ -850,9 +849,9 @@ export const MachineSetModel: K8sKind = {
export const MachineDeploymentModel: K8sKind = {
label: 'Machine Deployment',
labelPlural: 'Machine Deployments',
apiVersion: 'v1alpha1',
apiVersion: 'v1beta1',
path: 'machinedeployments',
apiGroup: 'cluster.k8s.io',
apiGroup: 'machine.openshift.io',
plural: 'machinedeployments',
abbr: 'MD',
namespaced: true,
Expand Down
6 changes: 3 additions & 3 deletions frontend/public/models/yaml-templates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ metadata:
name: "default"
spec: {}
`).setIn([referenceForModel(k8sModels.MachineDeploymentModel), 'default'], `
apiVersion: "cluster.k8s.io/v1alpha1"
apiVersion: "machine.openshift.io/v1beta1"
kind: MachineDeployment
metadata:
name: example
Expand All @@ -765,7 +765,7 @@ spec:
versions:
kubelet: ""
`).setIn([referenceForModel(k8sModels.MachineSetModel), 'default'], `
apiVersion: "cluster.k8s.io/v1alpha1"
apiVersion: "machine.openshift.io/v1beta1"
kind: MachineSet
metadata:
name: example
Expand All @@ -783,7 +783,7 @@ spec:
versions:
kubelet: ""
`).setIn([referenceForModel(k8sModels.MachineModel), 'default'], `
apiVersion: "cluster.k8s.io/v1alpha1"
apiVersion: "machine.openshift.io/v1beta1"
kind: Machine
metadata:
name: example
Expand Down

0 comments on commit 3e37cd6

Please sign in to comment.