Skip to content

Update to Operator SDK 1.1 #187

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

Merged
merged 9 commits into from
Nov 9, 2020
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
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.git
testbin
10 changes: 9 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ jobs:
uses: actions/setup-go@v2
with:
go-version: ^1.12
-
name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
-
name: Check out code into the Go module directory
uses: actions/checkout@v2
Expand Down Expand Up @@ -43,6 +48,7 @@ jobs:
name: Check format
run: |
go get -u github.com/google/addlicense
go get -u golang.org/x/tools/cmd/goimports
git reset HEAD --hard

make fmt
Expand All @@ -54,7 +60,9 @@ jobs:
fi
-
name: Run Go Tests
run: make test
run: |
python -m pip install --upgrade pip yq
make test

docker:
name: Check docker build
Expand Down
9 changes: 4 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
devworkspace-crds
config/crd/bases/workspace.devfile.io_devworkspaces.yaml
testbin
.vscode

# Binaries for programs and plugins
*.exe
*.exe~
*.dll
*.so
*.dylib
_output
vendor
devworkspace-crds
config/devfiles
.e2e/
bin

# Test binary, build with `go test -c`
Expand Down
406 changes: 177 additions & 229 deletions Makefile

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions PROJECT
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
domain: devfile.io
layout: go.kubebuilder.io/v2
multigroup: true
projectName: devworkspace-operator-migration
repo: github.com/devfile/devworkspace-operator
resources:
- group: controller
kind: Component
version: v1alpha1
- group: controller
kind: WorkspaceRouting
version: v1alpha1
- group: workspace
kind: DevWorkspace
version: v1alpha1
version: 3-alpha
plugins:
go.sdk.operatorframework.io/v2-alpha: {}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
// Red Hat, Inc. - initial API and implementation
//

// NOTE: Boilerplate only. Ignore this file.

// Package v1alpha1 contains API Schema definitions for the controller v1alpha1 API group
// +k8s:deepcopy-gen=package,register
// +kubebuilder:object:generate=true
// +groupName=controller.devfile.io
package v1alpha1

Expand All @@ -23,9 +21,12 @@ import (
)

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

// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme
)

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

Loading