Merge pull request #821 from darkowlzz/v1alpha4-api

Add v1alpha4 API
weaveworks · Apr 19, 2021 · cc6fa4c · cc6fa4c
2 parents 8b31ad7 + 28973b3
commit cc6fa4c
Show file tree

Hide file tree

Showing 23 changed files with 3,695 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@ IMAGE_TAG:=$(shell IGNITE_GIT_VERSION=$(GIT_VERSION) DOCKER_USER=$(DOCKER_USER)
 IS_DIRTY:=$(shell echo ${GIT_VERSION} | grep -c dirty)
 PROJECT = github.com/weaveworks/ignite
 APIS_DIR = ${PROJECT}/pkg/apis
-API_DIRS = ${APIS_DIR}/ignite,${APIS_DIR}/ignite/v1alpha2,${APIS_DIR}/ignite/v1alpha3,${APIS_DIR}/meta/v1alpha1
+API_DIRS = ${APIS_DIR}/ignite,${APIS_DIR}/ignite/v1alpha2,${APIS_DIR}/ignite/v1alpha3,${APIS_DIR}/ignite/v1alpha4,${APIS_DIR}/meta/v1alpha1
 CACHE_DIR = $(shell pwd)/bin/cache
 # Specifies if this is a CI build or not; if it is, it will save the docker image created to bin/$(GOARCH)/image.tar
 IS_CI_BUILD ?= 0

diff --git a/cmd/ignite/cmd/vmcmd/ps.go b/cmd/ignite/cmd/vmcmd/ps.go
@@ -23,7 +23,7 @@ func NewCmdPs(out io.Writer) *cobra.Command {
  also list VMs that are not currently running.
  Using the -f (--filter) flag, you can give conditions VMs should fullfilled to be displayed.
  You can filter on all the underlying fields of the VM struct, see the documentation:
- https://ignite.readthedocs.io/en/stable/api/ignite_v1alpha3#VM.
+ https://ignite.readthedocs.io/en/stable/api/ignite_v1alpha4#VM.
 
  Different operators can be used:
  - "=" and "==" for the equal

diff --git a/cmd/ignite/run/testdata/output/apply-vm-config-empty.json b/cmd/ignite/run/testdata/output/apply-vm-config-empty.json
@@ -1,6 +1,6 @@
 {
  "kind": "VM",
- "apiVersion": "ignite.weave.works/v1alpha3",
+ "apiVersion": "ignite.weave.works/v1alpha4",
  "metadata": {
  "name": "",
  "created": "2000-01-01T01:00:00Z"

diff --git a/cmd/ignite/run/testdata/output/apply-vm-config-json.json b/cmd/ignite/run/testdata/output/apply-vm-config-json.json
@@ -1,6 +1,6 @@
 {
  "kind": "VM",
- "apiVersion": "ignite.weave.works/v1alpha3",
+ "apiVersion": "ignite.weave.works/v1alpha4",
  "metadata": {
  "name": "",
  "created": "2000-01-01T01:00:00Z"

diff --git a/cmd/ignite/run/testdata/output/apply-vm-config-yaml.json b/cmd/ignite/run/testdata/output/apply-vm-config-yaml.json
@@ -1,6 +1,6 @@
 {
  "kind": "VM",
- "apiVersion": "ignite.weave.works/v1alpha3",
+ "apiVersion": "ignite.weave.works/v1alpha4",
  "metadata": {
  "name": "",
  "created": "2000-01-01T01:00:00Z"

diff --git a/cmd/ignite/run/testdata/output/inspect-json.txt b/cmd/ignite/run/testdata/output/inspect-json.txt
@@ -1,6 +1,6 @@
 {
  "kind": "VM",
- "apiVersion": "ignite.weave.works/v1alpha3",
+ "apiVersion": "ignite.weave.works/v1alpha4",
  "metadata": {
  "name": "someVM",
  "uid": "1699b6ba255cde7f",

diff --git a/cmd/ignite/run/testdata/output/inspect-yaml.txt b/cmd/ignite/run/testdata/output/inspect-yaml.txt
@@ -1,4 +1,4 @@
-apiVersion: ignite.weave.works/v1alpha3
+apiVersion: ignite.weave.works/v1alpha4
 kind: VM
 metadata:
  created: "2000-01-01T01:00:00Z"