Skip to content

Commit 0c197e7

Browse files
barney-sbarney-s
committed
Add advanced e2e test suite and add deployment with secrets to it. This is expected to fail due to: #272. So not invoking it as part of GH workflow
1 parent da9fc20 commit 0c197e7

File tree

20 files changed

+582
-55
lines changed

20 files changed

+582
-55
lines changed

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ deploy-kind: ko
243243
# Run e2e tests
244244
.PHONY: test-e2e
245245
test-e2e: ## Run e2e tests
246-
go test -v ./test/e2e/...
246+
go test -v ./test/e2e/suites/basic/...
247247

248248
.PHONY: test-e2e-kind
249249
test-e2e-kind: deploy-kind
250-
go test -v ./test/e2e/...
250+
make test-e2e

‎test/e2e/suites/advanced/main_test.go

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
// Copyright 2025 The Kube Resource Orchestrator Authors.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License"). You may
4+
// not use this file except in compliance with the License. A copy of the
5+
// License is located at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// or in the "license" file accompanying this file. This file is distributed
10+
// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
11+
// express or implied. See the License for the specific language governing
12+
// permissions and limitations under the License.
13+
14+
package advanced
15+
16+
import (
17+
"context"
18+
"fmt"
19+
"os"
20+
"testing"
21+
22+
"github.com/kro-run/kro/test/e2e/framework"
23+
)
24+
25+
var (
26+
f *framework.Framework
27+
)
28+
29+
func TestMain(m *testing.M) {
30+
// Create framework
31+
var err error
32+
33+
// Connect to the cluster (or create one)
34+
// Option 1: This uses the ENV provided kubeconfig instead of reading standard paths
35+
/*
36+
kubeconfig := os.Getenv("TEST_KUBECONFIG")
37+
if kubeconfig == "" {
38+
t.Skip("TEST_KUBECONFIG not set")
39+
}
40+
options := framework.WithKubeconfig(kubeconfig)
41+
*/
42+
43+
// Option 2: Create a kind cluster. we dont support local image build yet.
44+
/*
45+
framework.WithKindCluster(
46+
framework.WithName("kro-basic-test"),
47+
framework.WithWaitTimeout(5*time.Minute),
48+
*/
49+
50+
// Option 3: Do nothing. kubeconfig is loaded from standard path
51+
f, err = framework.New()
52+
if err != nil {
53+
fmt.Printf("failed to create framework: %v", err)
54+
os.Exit(1)
55+
}
56+
57+
// Setup framework
58+
if err := f.Setup(context.Background()); err != nil {
59+
fmt.Printf("failed to setup framework: %v", err)
60+
os.Exit(1)
61+
}
62+
63+
// Execute the tests
64+
code := m.Run()
65+
66+
// Teardown framework
67+
if err := f.Teardown(context.Background()); err != nil {
68+
fmt.Printf("failed to teardown framework: %v", err)
69+
os.Exit(1)
70+
}
71+
72+
// Exit with the test code
73+
os.Exit(code)
74+
}

‎test/e2e/suites/advanced/using_secrets_test.go

+90
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
// Copyright 2025 The Kube Resource Orchestrator Authors.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License"). You may
4+
// not use this file except in compliance with the License. A copy of the
5+
// License is located at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// or in the "license" file accompanying this file. This file is distributed
10+
// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
11+
// express or implied. See the License for the specific language governing
12+
// permissions and limitations under the License.
13+
14+
package advanced
15+
16+
import (
17+
"context"
18+
"testing"
19+
20+
"github.com/stretchr/testify/require"
21+
22+
"github.com/kro-run/kro/test/e2e/framework"
23+
)
24+
25+
func TestSecretsInResources(t *testing.T) {
26+
27+
tc, err := framework.NewTestCase(t, f, "secrets-in-resources")
28+
require.NoError(t, err)
29+
30+
// Run the test
31+
// Option 1: Run all steps automatically using the manifests to verify
32+
tc.RunTest(t, func(ctx context.Context) error {
33+
return tc.RunAllSteps(ctx)
34+
})
35+
36+
// Option 2: Run steps with custom logic
37+
/*
38+
tc.RunTest(t, func(ctx context.Context) error {
39+
// install the rgd
40+
if err := tc.RunStep(ctx, "step0"); err != nil {
41+
return err
42+
}
43+
44+
// create an instance of the rgd
45+
if err := tc.RunStep(ctx, "step1"); err != nil {
46+
return err
47+
}
48+
// Wait for deployment to be created
49+
err = tc.WaitForResource(ctx,
50+
schema.GroupVersionKind{
51+
Group: "apps",
52+
Version: "v1",
53+
Kind: "Deployment",
54+
},
55+
"test-instance",
56+
tc.Namespace,
57+
func(obj *unstructured.Unstructured) bool {
58+
replicas, found, _ := unstructured.NestedInt64(obj.Object, "spec", "replicas")
59+
return found && replicas == 2
60+
},
61+
)
62+
if err != nil {
63+
return err
64+
}
65+
// update the instance
66+
if err := tc.RunStep(ctx, "step2"); err != nil {
67+
return err
68+
}
69+
70+
// Wait for deployment to be created
71+
err = tc.WaitForResource(ctx,
72+
schema.GroupVersionKind{
73+
Group: "apps",
74+
Version: "v1",
75+
Kind: "Deployment",
76+
},
77+
"test-instance",
78+
tc.Namespace,
79+
func(obj *unstructured.Unstructured) bool {
80+
replicas, found, _ := unstructured.NestedInt64(obj.Object, "spec", "replicas")
81+
return found && replicas == 3
82+
},
83+
)
84+
if err != nil {
85+
return err
86+
}
87+
return nil
88+
})
89+
*/
90+
}

‎test/e2e/suites/basic/main_test.go

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
// Copyright 2025 The Kube Resource Orchestrator Authors.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License"). You may
4+
// not use this file except in compliance with the License. A copy of the
5+
// License is located at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// or in the "license" file accompanying this file. This file is distributed
10+
// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
11+
// express or implied. See the License for the specific language governing
12+
// permissions and limitations under the License.
13+
14+
package basic
15+
16+
import (
17+
"context"
18+
"fmt"
19+
"os"
20+
"testing"
21+
22+
"github.com/kro-run/kro/test/e2e/framework"
23+
)
24+
25+
var (
26+
f *framework.Framework
27+
)
28+
29+
func TestMain(m *testing.M) {
30+
// Create framework
31+
var err error
32+
33+
// Connect to the cluster (or create one)
34+
// Option 1: This uses the ENV provided kubeconfig instead of reading standard paths
35+
/*
36+
kubeconfig := os.Getenv("TEST_KUBECONFIG")
37+
if kubeconfig == "" {
38+
t.Skip("TEST_KUBECONFIG not set")
39+
}
40+
options := framework.WithKubeconfig(kubeconfig)
41+
*/
42+
43+
// Option 2: Create a kind cluster. we dont support local image build yet.
44+
/*
45+
framework.WithKindCluster(
46+
framework.WithName("kro-basic-test"),
47+
framework.WithWaitTimeout(5*time.Minute),
48+
*/
49+
50+
// Option 3: Do nothing. kubeconfig is loaded from standard path
51+
f, err = framework.New()
52+
if err != nil {
53+
fmt.Printf("failed to create framework: %v", err)
54+
os.Exit(1)
55+
}
56+
57+
// Setup framework
58+
if err := f.Setup(context.Background()); err != nil {
59+
fmt.Printf("failed to setup framework: %v", err)
60+
os.Exit(1)
61+
}
62+
63+
// Execute the tests
64+
code := m.Run()
65+
66+
// Teardown framework
67+
if err := f.Teardown(context.Background()); err != nil {
68+
fmt.Printf("failed to teardown framework: %v", err)
69+
os.Exit(1)
70+
}
71+
72+
// Exit with the test code
73+
os.Exit(code)
74+
}

‎test/e2e/suites/basic/basic_test.go ‎test/e2e/suites/basic/simple_deployment_test.go

-53
Original file line numberDiff line numberDiff line change
@@ -15,66 +15,13 @@ package basic
1515

1616
import (
1717
"context"
18-
"fmt"
19-
"os"
2018
"testing"
2119

2220
"github.com/stretchr/testify/require"
2321

2422
"github.com/kro-run/kro/test/e2e/framework"
2523
)
2624

27-
var (
28-
f *framework.Framework
29-
)
30-
31-
func TestMain(m *testing.M) {
32-
// Create framework
33-
var err error
34-
35-
// Connect to the cluster (or create one)
36-
// Option 1: This uses the ENV provided kubeconfig instead of reading standard paths
37-
/*
38-
kubeconfig := os.Getenv("TEST_KUBECONFIG")
39-
if kubeconfig == "" {
40-
t.Skip("TEST_KUBECONFIG not set")
41-
}
42-
options := framework.WithKubeconfig(kubeconfig)
43-
*/
44-
45-
// Option 2: Create a kind cluster. we dont support local image build yet.
46-
/*
47-
framework.WithKindCluster(
48-
framework.WithName("kro-basic-test"),
49-
framework.WithWaitTimeout(5*time.Minute),
50-
*/
51-
52-
// Option 3: Do nothing. kubeconfig is loaded from standard path
53-
f, err = framework.New()
54-
if err != nil {
55-
fmt.Printf("failed to create framework: %v", err)
56-
os.Exit(1)
57-
}
58-
59-
// Setup framework
60-
if err := f.Setup(context.Background()); err != nil {
61-
fmt.Printf("failed to setup framework: %v", err)
62-
os.Exit(1)
63-
}
64-
65-
// Execute the tests
66-
code := m.Run()
67-
68-
// Teardown framework
69-
if err := f.Teardown(context.Background()); err != nil {
70-
fmt.Printf("failed to teardown framework: %v", err)
71-
os.Exit(1)
72-
}
73-
74-
// Exit with the test code
75-
os.Exit(code)
76-
}
77-
7825
func TestSimpleDeploymentRGD(t *testing.T) {
7926

8027
tc, err := framework.NewTestCase(t, f, "simple-deployment-rgd")

‎test/e2e/testdata/secrets-in-resources/step0/inputs/rgd.yaml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
apiVersion: kro.run/v1alpha1
2+
kind: ResourceGraphDefinition
3+
metadata:
4+
name: deployment-with-secret-rgd
5+
spec:
6+
schema:
7+
apiVersion: v1alpha1
8+
kind: DeploymentWithSecret
9+
spec:
10+
replicas: integer | 1
11+
image: string | "nginx:latest"
12+
tokenID: string
13+
tokenSecret: string
14+
resources:
15+
- id: secret
16+
template:
17+
apiVersion: v1
18+
kind: Secret
19+
metadata:
20+
name: ${schema.metadata.name}-secret
21+
type: Opaque
22+
stringData:
23+
bootstrap: "true"
24+
token-id: ${schema.spec.tokenID}
25+
token-secret: ${schema.spec.tokenSecret}
26+
- id: deployment
27+
template:
28+
apiVersion: apps/v1
29+
kind: Deployment
30+
metadata:
31+
name: ${schema.metadata.name}
32+
spec:
33+
replicas: ${schema.spec.replicas}
34+
selector:
35+
matchLabels:
36+
app: ${schema.metadata.name}
37+
template:
38+
metadata:
39+
labels:
40+
app: ${schema.metadata.name}
41+
spec:
42+
containers:
43+
- name: main
44+
image: ${schema.spec.image}
45+
env:
46+
- name: TOKEN_ID
47+
valueFrom:
48+
secretKeyRef:
49+
name: ${schema.metadata.name}-secret
50+
key: token-id
51+
- name: TOKEN_SECRET
52+
valueFrom:
53+
secretKeyRef:
54+
name: ${schema.metadata.name}-secret
55+
key: token-secret

0 commit comments

Comments
 (0)