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.

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

Move to operator-sdk v.0.17.0 #363

Merged
merged 1 commit into from
May 4, 2020
+190 −24
Merged

Move to operator-sdk v.0.17.0 #363

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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
kubeconfig
.idea
/vendor
deploy/namespace-init.yaml
Expand Down
4 changes: 2 additions & 2 deletions config.base.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Setup variables for the Makefile
NAME=kubernetes-operator
OPERATOR_SDK_VERSION=0.15.1
OPERATOR_SDK_VERSION=0.17.0
GO_VERSION=1.13.1
PKG=github.com/jenkinsci/kubernetes-operator
DOCKER_ORGANIZATION=virtuslab
Expand All @@ -10,4 +10,4 @@ API_VERSION=v1alpha2
ALL_IN_ONE_DEPLOY_FILE_PREFIX=all-in-one
GEN_CRD_API=gen-crd-api-reference-docs
IMAGE_PULL_MODE=local
HELM_VERSION=3.1.2
HELM_VERSION=3.1.2
25 changes: 13 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,27 @@ require (
github.com/go-openapi/spec v0.19.4
github.com/golang/mock v1.3.1
github.com/mailgun/mailgun-go/v3 v3.6.0
github.com/operator-framework/operator-sdk v0.15.1
github.com/pkg/errors v0.8.1
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
github.com/operator-framework/operator-sdk v0.17.0
github.com/pkg/errors v0.9.1
github.com/robfig/cron v1.2.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.4.0
go.uber.org/zap v1.10.0
go.uber.org/zap v1.14.1
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b // indirect
golang.org/x/tools v0.0.0-20200504022951-6b6965ac5dd1 // indirect
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/api v0.17.4
k8s.io/apimachinery v0.17.4
k8s.io/cli-runtime v0.17.4
k8s.io/client-go v12.0.0+incompatible
k8s.io/code-generator v0.0.0
k8s.io/code-generator v0.17.4
k8s.io/gengo v0.0.0-20191010091904-7fa3014cb28f
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
sigs.k8s.io/controller-runtime v0.4.0
sigs.k8s.io/controller-tools v0.2.4
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
sigs.k8s.io/controller-runtime v0.5.2
sigs.k8s.io/controller-tools v0.2.8
)

// Pinned to kubernetes-1.16.2
Expand Down Expand Up @@ -64,7 +65,7 @@ replace (
replace (
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.35.1
github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.15.1
github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.17.0
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20181117043124-c2090bec4d9b
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.4.0
Expand Down
168 changes: 166 additions & 2 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/e2e/helm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestLintHelmChart(t *testing.T) {
func TestDeployHelmChart(t *testing.T) {
// Given
t.Parallel()
ctx := framework.NewTestCtx(t)
ctx := framework.NewContext(t)
defer ctx.Cleanup()

namespace, err := ctx.GetNamespace()
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ func TestMain(m *testing.M) {
framework.MainEntry(m)
}

func setupTest(t *testing.T) (string, *framework.TestCtx) {
ctx := framework.NewTestCtx(t)
func setupTest(t *testing.T) (string, *framework.Context) {
ctx := framework.NewContext(t)
err := ctx.InitializeClusterResources(nil)
if err != nil {
t.Fatalf("could not initialize cluster resources: %v", err)
Expand All @@ -53,7 +53,7 @@ func setupTest(t *testing.T) (string, *framework.TestCtx) {
t.Fatalf("could not add scheme to framework scheme: %v", err)
}

namespace, err := ctx.GetNamespace()
namespace, err := ctx.GetOperatorNamespace()
if err != nil {
t.Fatalf("could not get namespace: %v", err)
}
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ func printKubernetesPods(t *testing.T, namespace string) {
}
}

func showLogsIfTestHasFailed(t *testing.T, ctx *framework.TestCtx) {
namespace, err := ctx.GetNamespace()
func showLogsIfTestHasFailed(t *testing.T, ctx *framework.Context) {
namespace, err := ctx.GetOperatorNamespace()
if err != nil {
t.Fatalf("Failed to get '%s' namespace", err)
}
Expand All @@ -140,8 +140,8 @@ func showLogsIfTestHasFailed(t *testing.T, ctx *framework.TestCtx) {
}
}

func showLogsAndCleanup(t *testing.T, ctx *framework.TestCtx) {
namespace, err := ctx.GetNamespace()
func showLogsAndCleanup(t *testing.T, ctx *framework.Context) {
namespace, err := ctx.GetOperatorNamespace()
if err != nil {
t.Fatalf("Failed to get '%s' namespace", err)
}
Expand Down