Skip to content

Commit

Permalink
[OSSM-8141] Fix missing Tproxy label in httpbin deployment (when TPro…
Browse files Browse the repository at this point in the history
…xy=true) + changed apps in native sidecars test from TProxy to normal variant (#741)

* Fix missing Tproxy label in httpbin deployment (when TProxy=true)

* Change apps in native sidecars test from TProxy to normal variant
  • Loading branch information
mkralik3 authored Sep 16, 2024
1 parent 869a55c commit 04a6483
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions pkg/app/httpbin.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ func (a *httpbin) values() map[string]interface{} {
"InjectSidecar": a.injectSidecar,
"Name": a.deploymentName,
"Version": a.versionLabel,
"Tproxy": a.tproxy,
}
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/tests/tasks/injection/native_sidecars_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ func TestNativeSidecars(t *testing.T) {
oc.ApplyTemplate(t, meshNamespace, meshTmpl, meshValues)
oc.WaitSMCPReady(t, meshNamespace, "basic")

t.LogStep("Install httpbin and sleep in mode")
app.InstallAndWaitReady(t, app.HttpbinTproxy(ns.Foo), app.SleepTroxy(ns.Foo))
t.LogStep("Install httpbin and sleep app")
app.InstallAndWaitReady(t, app.Httpbin(ns.Foo), app.Sleep(ns.Foo))

t.NewSubTest("HTTP request from ingress gateway to httpbin in mode").Run(func(t TestHelper) {
oc.ApplyFile(t, ns.Foo, "https://raw.githubusercontent.com/maistra/istio/maistra-2.6/samples/httpbin/httpbin-gateway.yaml")
Expand Down
2 changes: 2 additions & 0 deletions pkg/tests/tasks/injection/tproxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ func TestTproxy(t *testing.T) {
}

t.Cleanup(func() {
t.LogStep("Remove privileged SCC from the app namespace")
shell.Executef(t, "oc adm policy remove-scc-from-group privileged system:serviceaccounts:%s", ns.Foo)
oc.RecreateNamespace(t, ns.Foo)
})

Expand Down

0 comments on commit 04a6483

Please sign in to comment.