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.

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

Move APIversion to v1beta1 #1019

Merged
merged 3 commits into from
Nov 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
type: object
type: object
type: object
version: v1alpha1
version: v1beta1
status:
acceptedNames:
kind: ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
status:
type: object
type: object
version: v1alpha1
version: v1beta1
status:
acceptedNames:
kind: ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ spec:
status:
type: object
type: object
version: v1alpha1
version: v1beta1
status:
acceptedNames:
kind: ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ spec:
required:
- unitTest
- kubectl
version: v1alpha1
version: v1beta1
status:
acceptedNames:
kind: ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ spec:
- parallel
- artifactsDir
- kubectl
version: v1alpha1
version: v1beta1
status:
acceptedNames:
kind: ""
Expand Down
2 changes: 1 addition & 1 deletion config/scratch/mysql-backup.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kudo.dev/v1alpha1
apiVersion: kudo.dev/v1beta1
kind: PlanExecution
metadata:
labels:
Expand Down
2 changes: 1 addition & 1 deletion config/scratch/mysql-restore.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kudo.dev/v1alpha1
apiVersion: kudo.dev/v1beta1
kind: PlanExecution
metadata:
labels:
Expand Down
4 changes: 2 additions & 2 deletions config/scratch/validation.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: kudo.dev/v1alpha1
apiVersion: kudo.dev/v1beta1
kind: PlanExecution
metadata:
labels:
instance: up
name: validation
namespace: default
ownerReferences:
- apiVersion: kudo.dev/v1alpha1
- apiVersion: kudo.dev/v1beta1
blockOwnerDeletion: true
controller: true
kind: Instance
Expand Down
2 changes: 1 addition & 1 deletion hack/update_codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ fi
all \
github.com/kudobuilder/kudo/pkg/client \
github.com/kudobuilder/kudo/pkg/apis \
"kudo:v1alpha1" \
"kudo:v1beta1" \
--go-header-file hack/boilerplate.go.txt # must be last for some reason
6 changes: 3 additions & 3 deletions keps/0008-operator-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ When searching a test step file, if a `TestStep` object is found, it includes se

```
type TestStep struct {
// The type meta object, should always be a GVK of kudo.dev/v1alpha1/TestStep.
// The type meta object, should always be a GVK of kudo.dev/v1beta1/TestStep.
TypeMeta
// Override the default metadata. Set labels or override the test step name.
ObjectMeta
Expand Down Expand Up @@ -287,7 +287,7 @@ The `Delete` list can be used to specify objects to delete prior to running the
A `TestStep` is also able to invoke kubectl commands or plugins by specifying a list of commands in the `kubectl` setting, e.g.:

```
apiVersion: kudo.dev/v1alpha1
apiVersion: kudo.dev/v1beta1
kind: TestStep
kubectl:
- apply -f ./testdata/pod.yaml
Expand Down Expand Up @@ -336,7 +336,7 @@ When searching the assertion file for a test step, if a `TestAssert` object is f

```
type TestAssert struct {
// The type meta object, should always be a GVK of kudo.dev/v1alpha1/TestAssert.
// The type meta object, should always be a GVK of kudo.dev/v1beta1/TestAssert.
TypeMeta
// Override the default timeout of 30 seconds (in seconds).
Timeout int
Expand Down
2 changes: 1 addition & 1 deletion kudo-e2e-test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kudo.dev/v1alpha1
apiVersion: kudo.dev/v1beta1
kind: TestSuite
crdDir: ./config/crds/
manifestDirs:
Expand Down
2 changes: 1 addition & 1 deletion kudo-test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: kudo.dev/v1alpha1
apiVersion: kudo.dev/v1beta1
kind: TestSuite
crdDir: ./config/crds/
manifestDirs:
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/addtoscheme_kudo_v1alpha1.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ limitations under the License.

package apis

import "github.com/kudobuilder/kudo/pkg/apis/kudo/v1alpha1"
import "github.com/kudobuilder/kudo/pkg/apis/kudo/v1beta1"

func init() {
// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
AddToSchemes = append(AddToSchemes, v1alpha1.SchemeBuilder.AddToScheme)
AddToSchemes = append(AddToSchemes, v1beta1.SchemeBuilder.AddToScheme)
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// Package v1alpha1 contains API Schema definitions for the kudo v1alpha1 API group
// Package v1beta1 contains API Schema definitions for the kudo v1beta1 API group
// +k8s:openapi-gen=true
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=github.com/kudobuilder/kudo/pkg/apis/kudo
// +k8s:defaulter-gen=TypeMeta
// +groupName=kudo.dev
package v1alpha1
package v1beta1
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1
package v1beta1

import (
"encoding/json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1
package v1beta1

import (
"testing"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1
package v1beta1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1
package v1beta1

import (
corev1 "k8s.io/api/core/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ limitations under the License.

// NOTE: Boilerplate only. Ignore this file.

// Package v1alpha1 contains API Schema definitions for the kudo v1alpha1 API group
// Package v1beta1 contains API Schema definitions for the kudo v1beta1 API group
// +k8s:openapi-gen=true
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=github.com/kudobuilder/kudo/pkg/apis/kudo
// +k8s:defaulter-gen=TypeMeta
// +groupName=kudo.dev
package v1alpha1
package v1beta1

import (
"k8s.io/apimachinery/pkg/runtime/schema"
Expand All @@ -30,7 +30,7 @@ import (

var (
// SchemeGroupVersion is group version used to register these objects
SchemeGroupVersion = schema.GroupVersion{Group: "kudo.dev", Version: "v1alpha1"}
SchemeGroupVersion = schema.GroupVersion{Group: "kudo.dev", Version: "v1beta1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package v1alpha1
package v1beta1

import (
corev1 "k8s.io/api/core/v1"
Expand All @@ -9,7 +9,7 @@ import (

// TestSuite configures which tests should be loaded.
type TestSuite struct {
// The type meta object, should always be a GVK of kudo.dev/v1alpha1/TestSuite.
// The type meta object, should always be a GVK of kudo.dev/v1beta1/TestSuite.
metav1.TypeMeta `json:",inline"`
// Set labels or the test suite name.
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down Expand Up @@ -53,7 +53,7 @@ type TestSuite struct {

// TestStep settings to apply to a test step.
type TestStep struct {
// The type meta object, should always be a GVK of kudo.dev/v1alpha1/TestStep.
// The type meta object, should always be a GVK of kudo.dev/v1beta1/TestStep.
metav1.TypeMeta `json:",inline"`
// Override the default metadata. Set labels or override the test step name.
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand All @@ -79,7 +79,7 @@ type TestStep struct {

// TestAssert represents the settings needed to verify the result of a test step.
type TestAssert struct {
// The type meta object, should always be a GVK of kudo.dev/v1alpha1/TestAssert.
// The type meta object, should always be a GVK of kudo.dev/v1beta1/TestAssert.
metav1.TypeMeta `json:",inline"`
// Override the default timeout of 30 seconds (in seconds).
Timeout int `json:"timeout"`
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions pkg/client/clientset/versioned/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions pkg/client/clientset/versioned/fake/clientset_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/client/clientset/versioned/fake/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/client/clientset/versioned/scheme/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading