Skip to content

OSSM-4880: Rebase building OpenSSL-based proxy image#860

Merged
openshift-merge-bot[bot] merged 5 commits intomaistra:maistra-2.5from
jewertow:rebase-openssl-based-proxy
Feb 26, 2024
Merged

OSSM-4880: Rebase building OpenSSL-based proxy image#860
openshift-merge-bot[bot] merged 5 commits intomaistra:maistra-2.5from
jewertow:rebase-openssl-based-proxy

Conversation

@jewertow
Copy link
Copy Markdown
Member

No description provided.

@openshift-ci openshift-ci bot added the size/L label Sep 30, 2023
* OSSM-2378: Use Maistra proxy CentOS Stream 8 img

For integration tests. Based on (maistra#609)

* Build container images with docker

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Use maistra proxy and CentOS Stream 8 as a base image for proxyv2

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Test VMs using CentOS Stream 8

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Temporarily skip failing security tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Temporarily skip tests suite telemetry.prometheus.wasm

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* fix(tests): enables fixed integration tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Jacek Ewertowski <jewertow@redhat.com>
@jewertow jewertow force-pushed the rebase-openssl-based-proxy branch from 9d67a56 to 9dc86ac Compare February 20, 2024 15:33
jwendell and others added 2 commits February 20, 2024 16:52
Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
* Do not rely on WASM extensions

Since maistra/proxy#253

* Remove wasm extensions from EnvoyFilters

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Disable tests for WASM extensions

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Remove commented code

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

---------

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Jonh Wendell <jwendell@redhat.com>
@jewertow jewertow force-pushed the rebase-openssl-based-proxy branch from 9dc86ac to b1e1fe2 Compare February 20, 2024 15:53
@jewertow
Copy link
Copy Markdown
Member Author

/retest

@jwendell
Copy link
Copy Markdown
Member

@jewertow maybe a legit error? Need executable 'rpmbuild' to convert dir to rpm

@jewertow
Copy link
Copy Markdown
Member Author

@jewertow maybe a legit error? Need executable 'rpmbuild' to convert dir to rpm

It seems that rpmbuild is present in the builder image:

docker run quay.io/maistra-dev/maistra-builder:2.5 which rpmbuild
useradd: user 'user' already exists
/usr/bin/rpmbuild

@jewertow
Copy link
Copy Markdown
Member Author

Beside that, it works on my computer, but I don't have rpmbuild. I only have rpm.

@yxun
Copy link
Copy Markdown
Member

yxun commented Feb 20, 2024

un quay.io/maistra-dev/maistra-builder:2.5 which rpmbuild

Here is my finding:

$ podman run quay.io/maistra-dev/maistra-builder:2.5 which rpmbuild
useradd: user 'user' already exists
which: no rpmbuild in (/rust/bin:/usr/lib/llvm/bin:/usr/local/go/bin:/gobin:/usr/local/google-cloud-sdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin)
$

I will add rpmbuild to our 2.5 builder image. Not clear why it exists from your command above.

@jewertow
Copy link
Copy Markdown
Member Author

/retest

5 similar comments
@jewertow
Copy link
Copy Markdown
Member Author

/retest

@jwendell
Copy link
Copy Markdown
Member

/retest

@jewertow
Copy link
Copy Markdown
Member Author

/retest

@jewertow
Copy link
Copy Markdown
Member Author

/retest

@jwendell
Copy link
Copy Markdown
Member

/retest

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
…work with OpenSSL

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
@jewertow
Copy link
Copy Markdown
Member Author

/retest

3 similar comments
@jewertow
Copy link
Copy Markdown
Member Author

/retest

@jewertow
Copy link
Copy Markdown
Member Author

/retest

@jewertow
Copy link
Copy Markdown
Member Author

/retest

if [[ "${JOB_TYPE:-presubmit}" == "postsubmit" ]]; then
# We run tests across all VM types only in postsubmit
nonDistrolessTargets+="docker.app_sidecar_ubuntu_xenial docker.app_sidecar_debian_11 docker.app_sidecar_centos_7 "
nonDistrolessTargets+="docker.app_sidecar_ubuntu_xenial docker.app_sidecar_ubuntu_jammy docker.app_sidecar_debian_11 docker.app_sidecar_centos_7 "
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to run this postsubmit target build ? It looks like that's building ubuntu and debian images. Should we skip that ?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, we could skip these images... But let's merge it as is for now and we can remove it in a follow-up.

"repoName": "proxy",
"file": "",
"lastStableSHA": "491c2e174bc6022e6af8beec7ee678cf48bbd130"
"lastStableSHA": "ae3bbc4313b45af63777a2588388796d74221cfd"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you are going to push another commit into this PR, you could also update this SHA.

optional though. We can do it in a follow up

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will do it in a follow-up, because I want to unblock our e2e tests, and I want to avoid additional commits, because the CI is very unstable recently.

@openshift-merge-bot openshift-merge-bot bot merged commit 75073b3 into maistra:maistra-2.5 Feb 26, 2024
yxun pushed a commit to yxun/maistra-istio that referenced this pull request May 22, 2024
* OSSM-2378: Use Maistra proxy CentOS Stream 8 img (maistra#713)

* OSSM-2378: Use Maistra proxy CentOS Stream 8 img

For integration tests. Based on (maistra#609)

* Build container images with docker

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Use maistra proxy and CentOS Stream 8 as a base image for proxyv2

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Test VMs using CentOS Stream 8

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Temporarily skip failing security tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Temporarily skip tests suite telemetry.prometheus.wasm

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* fix(tests): enables fixed integration tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Jacek Ewertowski <jewertow@redhat.com>

* Use our proxy (maistra#801)

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* OSSM-5958: Remove wasm extensions (maistra#937)

* Do not rely on WASM extensions

Since maistra/proxy#253

* Remove wasm extensions from EnvoyFilters

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Disable tests for WASM extensions

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Remove commented code

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

---------

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Jonh Wendell <jwendell@redhat.com>

* Disable failing tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Fix TestTrustDomainValidation - change expected TLS error to make it work with OpenSSL

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

---------

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Bartosz Majsak <bartosz.majsak@gmail.com>
Co-authored-by: Jonh Wendell <jonh.wendell@redhat.com>
Co-authored-by: Jonh Wendell <jwendell@redhat.com>
yxun pushed a commit to yxun/maistra-istio that referenced this pull request Jun 3, 2024
* OSSM-2378: Use Maistra proxy CentOS Stream 8 img (maistra#713)

* OSSM-2378: Use Maistra proxy CentOS Stream 8 img

For integration tests. Based on (maistra#609)

* Build container images with docker

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Use maistra proxy and CentOS Stream 8 as a base image for proxyv2

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Test VMs using CentOS Stream 8

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Temporarily skip failing security tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Temporarily skip tests suite telemetry.prometheus.wasm

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* fix(tests): enables fixed integration tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Jacek Ewertowski <jewertow@redhat.com>

* Use our proxy (maistra#801)

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* OSSM-5958: Remove wasm extensions (maistra#937)

* Do not rely on WASM extensions

Since maistra/proxy#253

* Remove wasm extensions from EnvoyFilters

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Disable tests for WASM extensions

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Remove commented code

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

---------

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Jonh Wendell <jwendell@redhat.com>

* Disable failing tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Fix TestTrustDomainValidation - change expected TLS error to make it work with OpenSSL

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

---------

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Bartosz Majsak <bartosz.majsak@gmail.com>
Co-authored-by: Jonh Wendell <jonh.wendell@redhat.com>
Co-authored-by: Jonh Wendell <jwendell@redhat.com>
jwendell added a commit to yxun/maistra-istio that referenced this pull request Jun 17, 2024
* OSSM-2378: Use Maistra proxy CentOS Stream 8 img (maistra#713)

* OSSM-2378: Use Maistra proxy CentOS Stream 8 img

For integration tests. Based on (maistra#609)

* Build container images with docker

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Use maistra proxy and CentOS Stream 8 as a base image for proxyv2

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Test VMs using CentOS Stream 8

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Temporarily skip failing security tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Temporarily skip tests suite telemetry.prometheus.wasm

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* fix(tests): enables fixed integration tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Jacek Ewertowski <jewertow@redhat.com>

* Use our proxy (maistra#801)

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* OSSM-5958: Remove wasm extensions (maistra#937)

* Do not rely on WASM extensions

Since maistra/proxy#253

* Remove wasm extensions from EnvoyFilters

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Disable tests for WASM extensions

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Remove commented code

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

---------

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Jonh Wendell <jwendell@redhat.com>

* Disable failing tests

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

* Fix TestTrustDomainValidation - change expected TLS error to make it work with OpenSSL

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>

---------

Signed-off-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Bartosz Majsak <bartosz.majsak@gmail.com>
Co-authored-by: Jonh Wendell <jonh.wendell@redhat.com>
Co-authored-by: Jonh Wendell <jwendell@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants