Skip to content

S2I Imagestreams does not work in Shared Cluster #244

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
phracek merged 1 commit into from
Apr 4, 2025
Merged

S2I Imagestreams does not work in Shared Cluster #244

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
4 changes: 2 additions & 2 deletions test/test_httpd_ex_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class TestHTTPDExExampleRepo:

def setup_method(self):
self.template_name = get_service_image(IMAGE_NAME)
self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION, shared_cluster=True)
self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION)

def teardown_method(self):
self.oc_api.delete_project()
Expand All @@ -34,7 +34,7 @@ def test_httpd_ex_template_inside_cluster(self):
app=f"https://github.com/sclorg/httpd-ex#{BRANCH_TO_TEST}",
context="."
)
assert self.oc_api.template_deployed(name_in_template=self.template_name)
assert self.oc_api.is_template_deployed(name_in_template=self.template_name)
assert self.oc_api.check_response_inside_cluster(
name_in_template=self.template_name, expected_output="Welcome to your static httpd"
)
7 changes: 4 additions & 3 deletions test/test_httpd_imagestream_s2i.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class TestHTTPDImagestreamS2I:

def setup_method(self):
self.template_name = get_service_image(IMAGE_NAME)
self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION, shared_cluster=True)
self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION)

def teardown_method(self):
self.oc_api.delete_project()
Expand All @@ -33,9 +33,10 @@ def test_inside_cluster(self):
imagestream_file=f"imagestreams/httpd-{os_name}.json",
image_name=IMAGE_NAME,
app="https://github.com/sclorg/httpd-container.git",
context="examples/sample-test-app"
context="examples/sample-test-app",
service_name=self.template_name
)
assert self.oc_api.template_deployed(name_in_template=self.template_name)
assert self.oc_api.is_s2i_pod_running(pod_name_prefix=self.template_name)
assert self.oc_api.check_response_inside_cluster(
name_in_template=self.template_name, expected_output="This is a sample s2i application with static content"
)
4 changes: 2 additions & 2 deletions test/test_httpd_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class TestHTTPDIntegrationTemplate:

def setup_method(self):
self.template_name = get_service_image(IMAGE_NAME)
self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION, shared_cluster=True)
self.oc_api = OpenShiftAPI(pod_name_prefix=self.template_name, version=VERSION)

def teardown_method(self):
self.oc_api.delete_project()
Expand All @@ -31,7 +31,7 @@ def test_httpd_ex_template_inside_cluster(self):
app=f"https://github.com/sclorg/httpd-container.git",
context="examples/sample-test-app"
)
assert self.oc_api.template_deployed(name_in_template=self.template_name)
assert self.oc_api.is_template_deployed(name_in_template=self.template_name)
assert self.oc_api.check_response_inside_cluster(
name_in_template=self.template_name, expected_output="This is a sample s2i application with static content"
)