Skip to content

Commit

Permalink
address PR feedback
Browse files Browse the repository at this point in the history
Signed-off-by: Brian DeGeeter <b.degeeter@f5.com>
  • Loading branch information
Brian DeGeeter committed May 6, 2022
1 parent 6fdce39 commit fde1e24
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 16 deletions.
5 changes: 3 additions & 2 deletions tests/integration/credset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,8 @@ func NewTestCredSet(csName string) *porterv1.CredentialSet {
},
Spec: porterv1.CredentialSetSpec{
//TODO: get schema version from porter version?
SchemaVersion: schemaVersion,
// https://github.com/getporter/porter/pull/2052
SchemaVersion: "1.0.1",
Name: csName,
},
}
Expand Down Expand Up @@ -288,7 +289,7 @@ func NewTestInstallation(iName string) *porterv1.Installation {
GenerateName: "porter-test-me-",
},
Spec: porterv1.InstallationSpec{
SchemaVersion: schemaVersion,
SchemaVersion: "1.0.1",
Name: iName,
Bundle: porterv1.OCIReferenceParts{
Repository: "ghcr.io/bdegeeter/porter-test-me",
Expand Down
13 changes: 0 additions & 13 deletions tests/integration/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import (
var cfg *rest.Config
var k8sClient client.Client
var testEnv *envtest.Environment
var schemaVersion string

func TestAPIs(t *testing.T) {
RegisterFailHandler(Fail)
Expand Down Expand Up @@ -115,18 +114,6 @@ var _ = AfterSuite(func() {
Expect(err).NotTo(HaveOccurred())
})

var _ = BeforeEach(func() {
schemaVersion = "1.0.1"
}, 5)

var _ = AfterEach(func() {
if _, ok := os.LookupEnv("KEEP_TESTS"); ok {
return
}
//TODO: don't reuse namespace for all tests move this to suite/magefile cleanup
//deleteNamespace(testNamespace)
}, 5)

func createTestNamespace(ctx context.Context) string {
ns := &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Expand Down
Binary file removed tests/integration/testdata/kubernetes-linux-amd64
Binary file not shown.
1 change: 0 additions & 1 deletion tests/integration/testdata/operator_porter_config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#TODO: remove this file
debug: true
debug-plugins: true
default-secrets: "kubernetes-secrets"
Expand Down

0 comments on commit fde1e24

Please sign in to comment.