Skip to content

Update machine API group and version #1161

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

Merged
openshift-merge-robot merged 1 commit into from
Feb 8, 2019
Merged

Update machine API group and version #1161

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
14 changes: 7 additions & 7 deletions frontend/public/models/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,13 +818,13 @@ export const APIServiceModel: K8sKind = {
};

// Cluster API resources
// https://github.com/kubernetes-sigs/cluster-api
// https://github.com/openshift/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 +836,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 +850,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
View file
Open in desktop
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