Skip to content

remove unused controllers #504

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

Merged
merged 3 commits into from
Jul 23, 2023
Merged

remove unused controllers #504

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2014c16
remove unused controllers
asm582 Jul 21, 2023
5bd5de5
fix test
asm582 Jul 22, 2023
b210494
fix test 1
asm582 Jul 22, 2023
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
Prev Previous commit
fix test 1
  • Loading branch information
@asm582
asm582 committed Jul 22, 2023
commit b210494ab32b80fb088c998b0cb11c1ca989a498
79 changes: 49 additions & 30 deletions test/e2e/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2952,24 +2952,40 @@ func createBadPodTemplateAW(context *context, name string) *arbv1.AppWrapper {
}

func createPodTemplateAW(context *context, name string) *arbv1.AppWrapper {
rb := []byte(`{"metadata":
{
rb := []byte(`{"apiVersion": "v1",
"kind": "Pod",
"metadata": {
"name": "aw-podtemplate-1",
"namespace": "test",
"labels": {
"appwrapper.mcad.ibm.com": "aw-podtemplate-2"
}
},
"spec": {
"containers": [
{
"name": "aw-podtemplate-1",
"image": "kicbase/echo-server:1.0",
"ports": [
{
"containerPort": 80
}
]
}
]
}
} `)

rb1 := []byte(`{"apiVersion": "v1",
"kind": "Pod",
"metadata": {
"name": "aw-podtemplate-2",
"namespace": "test",
"labels": {
"app": "aw-podtemplate-2"
"appwrapper.mcad.ibm.com": "aw-podtemplate-2"
}
},
"template": {
"metadata": {
"labels": {
"app": "aw-podtemplate-2"
},
"annotations": {
"appwrapper.mcad.ibm.com/appwrapper-name": "aw-podtemplate-2"
}
},
"spec": {
"spec": {
"containers": [
{
"name": "aw-podtemplate-2",
Expand All @@ -2982,7 +2998,7 @@ func createPodTemplateAW(context *context, name string) *arbv1.AppWrapper {
}
]
}
}} `)
} `)
var schedSpecMin int = 2

aw := &arbv1.AppWrapper{
Expand All @@ -3001,11 +3017,21 @@ func createPodTemplateAW(context *context, name string) *arbv1.AppWrapper {
Name: fmt.Sprintf("%s-%s", name, "item"),
Namespace: context.namespace,
},
DesiredAvailable: 2,
DesiredAvailable: 1,
GenericTemplate: runtime.RawExtension{
Raw: rb,
},
},
{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-%s", name, "item1"),
Namespace: context.namespace,
},
DesiredAvailable: 1,
GenericTemplate: runtime.RawExtension{
Raw: rb1,
},
},
},
},
},
Expand All @@ -3018,24 +3044,16 @@ func createPodTemplateAW(context *context, name string) *arbv1.AppWrapper {
}

func createPodCheckFailedStatusAW(context *context, name string) *arbv1.AppWrapper {
rb := []byte(`{"metadata":
{
rb := []byte(`{"apiVersion": "v1",
"kind": "Pod",
"metadata": {
"name": "aw-checkfailedstatus-1",
"namespace": "test",
"labels": {
"app": "aw-checkfailedstatus-1"
"appwrapper.mcad.ibm.com": "aw-checkfailedstatus-1"
}
},
"template": {
"metadata": {
"labels": {
"app": "aw-checkfailedstatus-1"
},
"annotations": {
"appwrapper.mcad.ibm.com/appwrapper-name": "aw-checkfailedstatus-1"
}
},
"spec": {
"spec": {
"containers": [
{
"name": "aw-checkfailedstatus-1",
Expand All @@ -3051,11 +3069,12 @@ func createPodCheckFailedStatusAW(context *context, name string) *arbv1.AppWrapp
{
"effect": "NoSchedule",
"key": "key1",
"operator": "Exists"
"value": "value1",
"operator": "Equal"
}
]
}
}} `)
} `)
var schedSpecMin int = 1

aw := &arbv1.AppWrapper{
Expand Down