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.

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

[7.82.x] CRW-4824 Updating annotations for operators to meet new OpenShift requirements #1817

Merged
merged 4 commits into from
Mar 12, 2024

Conversation

SDawley
Copy link
Contributor

@SDawley SDawley commented Mar 12, 2024

What does this PR do?

There are newly implemented requirements (tests became mandatory last week) that requires a change in operator annotations:

https://docs.openshift.com/container-platform/4.15/operators/operator_sdk/osdk-generating-csvs.html#osdk-csv-annotations-infra_osdk-generating-csvs (see table 3)

So I’ve replaced

operators.openshift.io/infrastructure-features: '["disconnected", "proxy-aware",
      "fips"]'

with

features.operators.openshift.io/disconnected: “true”
features.operators.openshift.io/fips-compliant: “true”
features.operators.openshift.io/proxy-aware: “true”
features.operators.openshift.io/tls-profiles: “true”
features.operators.openshift.io/token-auth-aws: “false”
features.operators.openshift.io/token-auth-azure: “false”
features.operators.openshift.io/token-auth-gcp: “false”

Optional:

features.operators.openshift.io/cnf: “false”
features.operators.openshift.io/cni: “false”
features.operators.openshift.io/csi: “false”

Justifications for true/false:

  • Disconnected, fips and proxy-aware were already set using the old format
  • tls-profiles I set to true because TLS mode is on by default and configurable.
  • aws is false because I found AWS in vendor files but nothing that’s configurable on our end.
  • azure is false because the OpenShift docs specifically mentioned the Cloud Credential Operator which I found no mention of/reference to.
  • gcp is false for the same reason as Azure.
  • cnf is false because I found no references to the Cloud-Native Network Function.
  • cni is false because I only found references to the Container Network Interface in vendor files but nothing configured/configurable by Che.
  • csi is false because like CNI the only references to the Container Storage Interface were in vendor files.

I also ran update-dev-dependencies which updated some versions.

What issues does this PR fix or reference?

https://issues.redhat.com/browse/CRW-4824
Nick created this issue last year.

PR Checklist

As the author of this Pull Request I made sure that:

Reviewers

Reviewers, please comment how you tested the PR when approving it.

@SDawley SDawley requested review from tolusha and ibuziuk as code owners March 12, 2024 00:51
Copy link

openshift-ci bot commented Mar 12, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: SDawley

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tolusha
Copy link
Contributor

tolusha commented Mar 12, 2024

It is needed to avoid changes in images when backporting to .x branch

@tolusha tolusha merged commit c0f4cd6 into 7.82.x Mar 12, 2024
13 checks passed
@tolusha tolusha deleted the CRW4824_3.12 branch March 12, 2024 15:32
@devstudio-release
Copy link

Build 3.12 :: operator_3.12/3: Console, Changes, Git Data

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

Build 3.12 :: operator_3.12/3: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.12/173 triggered

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

Build 3.12 :: copyIIBsToQuay/2542: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: sync-to-downstream_3.12/174: SUCCESS

Build container: devspaces-operator-bundle synced; /DS_CI/get-sources-rhpkg-container-build_3.12/173 triggered; /job/DS_CI/job/dsc_3.12 triggered;

@devstudio-release
Copy link

Build 3.12 :: operator-bundle_3.12/94: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.12/174 triggered

@devstudio-release
Copy link

Build 3.12 :: dsc_3.12/32: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: update-digests_3.12/296: SUCCESS

Detected new images: rebuild operator-bundle
* devspaces-operator; /DS_CI/operator-bundle_3.12/94 triggered

@devstudio-release
Copy link

Build 3.12 :: dsc_3.12/32: SUCCESS

3.12.0-CI

@devstudio-release
Copy link

Build 3.12 :: copyIIBsToQuay/2543: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: copyIIBsToQuay/2543: SUCCESS

3.12
arches = x86_64, s390x, ppc64le;
  * LATEST DS OPERATOR BUNDLE = <a href=https://quay.io/repository/devspaces/devspaces-operator-bundle?tab=tags>registry-proxy.engineering.redhat.com/rh-osbs/devspaces-operator-bundle:3.12-178
  * LATEST DWO OPERATOR BUNDLE = <a href=https://quay.io/repository/devworkspace/devworkspace-operator-bundle?tab=tags>registry-proxy.engineering.redhat.com/rh-osbs/devworkspace-operator-bundle:0.26-1
+ s390x-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.12-v4.15-688303-678930-s390x
  + quay.io/devspaces/iib:3.12-v4.15-s390x
  + quay.io/devspaces/iib:latest-v4.15-s390x
  + quay.io/devspaces/iib:3.12-v4.14-688277-678919-s390x
  + quay.io/devspaces/iib:3.12-v4.14-s390x
  + quay.io/devspaces/iib:latest-v4.14-s390x
  + quay.io/devspaces/iib:3.12-v4.13-688251-678909-s390x
  + quay.io/devspaces/iib:3.12-v4.13-s390x
  + quay.io/devspaces/iib:latest-v4.13-s390x
  + quay.io/devspaces/iib:3.12-v4.12-688201-678895-s390x
  + quay.io/devspaces/iib:3.12-v4.12-s390x
  + quay.io/devspaces/iib:latest-v4.12-s390x
+ x86_64-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.12-v4.15-688303-678930-x86_64
  + quay.io/devspaces/iib:3.12-v4.15-x86_64
  + quay.io/devspaces/iib:latest-v4.15-x86_64
  + quay.io/devspaces/iib:3.12-v4.14-688277-678919-x86_64
  + quay.io/devspaces/iib:3.12-v4.14-x86_64
  + quay.io/devspaces/iib:latest-v4.14-x86_64
  + quay.io/devspaces/iib:3.12-v4.13-688251-678909-x86_64
  + quay.io/devspaces/iib:3.12-v4.13-x86_64
  + quay.io/devspaces/iib:latest-v4.13-x86_64
  + quay.io/devspaces/iib:3.12-v4.12-688201-678895-x86_64
+ ppc64le-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.12-v4.15-688303-678930-ppc64le
  + quay.io/devspaces/iib:3.12-v4.15-ppc64le
  + quay.io/devspaces/iib:latest-v4.15-ppc64le
  + quay.io/devspaces/iib:3.12-v4.14-688277-678919-ppc64le
  + quay.io/devspaces/iib:3.12-v4.14-ppc64le
  + quay.io/devspaces/iib:latest-v4.14-ppc64le
  + quay.io/devspaces/iib:3.12-v4.13-688251-678909-ppc64le
  + quay.io/devspaces/iib:3.12-v4.13-ppc64le
  + quay.io/devspaces/iib:latest-v4.13-ppc64le
  + quay.io/devspaces/iib:3.12-v4.12-688201-678895-ppc64le
  + quay.io/devspaces/iib:3.12-v4.12-ppc64le
  + quay.io/devspaces/iib:latest-v4.12-ppc64le

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants