Merge pull request #620 from darkowlzz/remove-v1alpha1

.circleci/config.yml

@@ -39,9 +39,7 @@ jobs:
     - restore_cache:
         key: bin-cache
     # Run autogeneration and see if there are differences
-    # TODO: Fix this; somehow the docs/api/ignite_v1alpha1.md ends up being malformatted in CI; it adds
-    # <sup>@</sup>@ in the beginning of the file for some strange reason in CI, but not locally
-    - run: make autogen && make tidy-in-docker && git status --short && git checkout HEAD docs/api/ignite_v1alpha1.md
+    - run: make autogen && make tidy-in-docker && git status --short
     # Save the bin/cache directory
     - save_cache:
         key: bin-cache

Makefile

@@ -41,7 +41,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/v1alpha1,${APIS_DIR}/ignite/v1alpha2,${APIS_DIR}/meta/v1alpha1
+API_DIRS = ${APIS_DIR}/ignite,${APIS_DIR}/ignite/v1alpha2,${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

pkg/apis/ignite/scheme/scheme.go

@@ -6,7 +6,6 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 
 	"github.com/weaveworks/ignite/pkg/apis/ignite"
-	"github.com/weaveworks/ignite/pkg/apis/ignite/v1alpha1"
 	"github.com/weaveworks/ignite/pkg/apis/ignite/v1alpha2"
 	"github.com/weaveworks/libgitops/pkg/serializer"
 )
@@ -30,7 +29,6 @@ func init() {
 // AddToScheme builds the scheme using all known versions of the api.
 func AddToScheme(scheme *runtime.Scheme) {
 	utilruntime.Must(ignite.AddToScheme(Scheme))
-	utilruntime.Must(v1alpha1.AddToScheme(Scheme))
 	utilruntime.Must(v1alpha2.AddToScheme(Scheme))
 	utilruntime.Must(scheme.SetVersionPriority(v1alpha2.SchemeGroupVersion))
 }