Skip to content
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

STF 1.5.5 release ops #161

Merged
merged 8 commits into from
Aug 29, 2024
Merged

STF 1.5.5 release ops #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5687756
Bump actions checkout to v4
vkmc Apr 29, 2024
9d8bbb6
Merge pull request #159 from infrawatch/vkmc-gh-checkout-v4
vkmc Apr 30, 2024
dde1677
Update SGO to support OCP 4.16
vkmc Aug 15, 2024
432d7cb
Merge pull request #160 from infrawatch/STF-1807/update-sgo-OCP-4.16
vkmc Aug 22, 2024
c11cfee
Merge branch 'master' into release-prep-1.5.5
vkmc Aug 22, 2024
32ef756
Use openshift-ansible-operator 4.14 in SGO
vkmc Aug 26, 2024
bcdd74d
Merge pull request #162 from infrawatch/STF-1816/bump-openshift-ansib…
vkmc Aug 27, 2024
dd9da06
Merge branch 'master' into release-prep-1.5.5
vkmc Aug 28, 2024
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
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4.1.3

- name: Install Ansible
run: python -m pip install 'ansible <= 2.9'
Expand All @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4.1.3

- name: Verify image builds
run: docker build --tag infrawatch/smart-gateway-operator:latest --file build/Dockerfile .
Expand All @@ -40,7 +40,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4.1.3

- name: Get operator-sdk image 0.19.4
run: curl --output operator-sdk -JL https://github.com/operator-framework/operator-sdk/releases/download/$RELEASE_VERSION/operator-sdk-$RELEASE_VERSION-x86_64-linux-gnu
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4.1.3

# prepare environment to buld the bundle
- name: Get operator-sdk image 0.19.4
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
run: operator-sdk-$RELEASE_VERSION bundle validate --verbose /tmp/bundle

- name: Create KinD cluster to execute scorecard tests
uses: helm/kind-action@v1.4.0
uses: helm/kind-action@v1.10.0

# perform scorecard checks against a KinD cluster
- name: Check scorecord validation
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we update this base? I just spotted it with SGO, and may have missed with STO

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was updated in STO already :) infrawatch/service-telemetry-operator@27cb54a

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/openshift/origin-ansible-operator:4.12
FROM quay.io/openshift/origin-ansible-operator:4.14

# temporarily switch to root user to adjust image layers
USER 0
Expand Down
2 changes: 1 addition & 1 deletion deploy/olm-catalog/smart-gateway-operator/Dockerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v0.19.4
LABEL operators.operatorframework.io.metrics.project_layout=ansible
LABEL com.redhat.delivery.operator.bundle=true
LABEL com.redhat.openshift.versions="v4.12-v4.14"
LABEL com.redhat.openshift.versions="v4.14-v4.16"
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this correct?

In STO we didn't drop 4.12 in the Dockerfile https://github.com/infrawatch/service-telemetry-operator/pull/628/files#diff-1bdd52a34bf3a3abe6a623c0296503ce293c3a2c7ebdf65e8290b282d4574b9cR16

I have a hunch this is the correct version if we don't intend to support 4.12 anymore, in which case perhaps the STO one needs to change? I think it was simply expanded because we still have 4.12 testing happening and Emma expanded it to bring 4.16 online.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch. Yes, I think we should drop 4.12 from STO. Keeping it doesn't hurt, but we want to move from it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We already dropped upstream CI https://github.com/infrawatch/service-telemetry-operator/blob/master/.zuul.yaml, so I don't see a point of keeping it. I will propose a change for STO.

LABEL com.redhat.delivery.backport=false

LABEL com.redhat.component="smart-gateway-operator-bundle-container" \
Expand Down
2 changes: 1 addition & 1 deletion deploy/olm-catalog/smart-gateway-operator/metadata/properties.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
properties:
- type: olm.maxOpenShiftVersion
value: "4.14"
value: "4.16"