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

Jump to bottom

[release-4.13] Merge upstream tag v1.28.0 to release-4.13 #311

Closed
wants to merge 26 commits into from
Closed

[release-4.13] Merge upstream tag v1.28.0 to release-4.13 #311

wants to merge 26 commits into from

Conversation

rashmigottipati
Copy link
Member

This PR is to downstream the upstream Operator-SDK v1.28.0 release to the release-4.13 branch.

acornett21 and others added 26 commits February 15, 2023 11:00
@acornett21
updating PodSecurityContext and SecurityContext for scorecard pod/con…
8f06eb8 
…tainers (#6294)

Signed-off-by: Adam D. Cornett <adc@redhat.com>
@jberkhahn
fix broken links to molecule docs (#6313)
912231b 
Signed-off-by: jberkhahn <jaberkha@us.ibm.com>
@everettraven
fix ansible CI (#6325)
5049e10 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven
(ansible): update ansible base images to use multi-stage builds (#6333)
8e26d14 
* update ansible base images to multi-stage builds

so that we can ensure all packages are always included in the images we deliver
by installing/building all packages in a build stage and copying them over
to the final build stage.

fixes #6302

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* update 2.11 preview image changes

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

---------

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@everettraven
update kubernetes.core collection default to v2.4.0 (#6334)
5edb430 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@jberkhahn
Bump operator-manifest-tools dependency (#6316)
d828db2 
- generate bundle now specifies default auth when pulling images

Signed-off-by: jberkhahn <jaberkha@us.ibm.com>
@dharmit @varshaprasad96
Update tutorial.md (#6311)
f5c0a5c 
* Update tutorial.md

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>

* Update website/content/en/docs/building-operators/golang/tutorial.md

Co-authored-by: Varsha <varshaprasad96@gmail.com>
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>

---------

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
Co-authored-by: Varsha <varshaprasad96@gmail.com>
@dharmit
Fixes to golang tutorial (#6321)
e3c5dd8 
These fixes sync the examples with the code

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
@everettraven
(scorecard): Add new images for default untar and storage options (#6…
c57ebf9 
…335)

* add images for scorecard untar and storage

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* Add new images for scorecard

and use them as the default untar and storage images to ensure
that scorecard pods are fully compliant with restricted PSA. This
is done by making the images run as non-root by default (sets the user
to non-root in the Dockerfile)

fixes #6295

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* update images & docs;add changelog

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* add missing newline

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

---------

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@dharmit @everettraven
Adds note about repo flag (#6312)
93ed65f 
* Adds note about repo flag

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>

* Update website/content/en/docs/building-operators/golang/tutorial.md

Co-authored-by: Bryce Palmer <everettraven@gmail.com>
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>

---------

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
Co-authored-by: Bryce Palmer <everettraven@gmail.com>
@everettraven
(actions): Fix Ansible-Operator base image build problems due to `cry…
9d2f672 
…ptography` package (#6348)

* revert recent ansible-operator changes

including the base.Dockerfile and repinning cryptography to v3.3.2
to fix image build issues that are blocking releases && CI

* update changelog
* update changelog
* fix typo in pipfile
* update Pipfile.lock
* disregard a CVE for now
* disregard a CVE for now
* try this
* disregard all cryptography CVEs for now
* disregard all cryptography CVEs for now
* missed one

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
Updating openshift-enterprise-operator-sdk images to be consistent wi…
81770e9 
…th ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/openshift-enterprise-operator-sdk.yml
Updating openshift-enterprise-ansible-operator images to be consisten…
bdbc11e 
…t with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/openshift-enterprise-ansible-operator.yml
Updating openshift-enterprise-helm-operator images to be consistent w…
8596ccc 
…ith ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/openshift-enterprise-helm-operator.yml
@rashmigottipati
Upgrade SDK to use Kubernetes 1.26.2 (#6352)
e5a6930 
* Upgrade Kubernetes dependencies from `1.25` to `1.26`.
* Upgrade `sigs.k8s.io/controller-tools` from `v0.10.0` to `v0.11.3`. More info: https://github.com/kubernetes-sigs/controller-tools/releases
* Upgrade `sigs.k8s.io/controller-runtime` dependency from `v0.13.0` to `v0.14.5`. More info: https://github.com/kubernetes-sigs/controller-runtime/releases
* Upgrade `k8s.io/client-go` dependency from `v0.25.3` to `v0.26.2`.
* Upgrade `controller-gen` dependency from `v0.10.0` to `v0.11.1`.
* Upgrade `kube-rbac-proxy` from `v0.13.0` to `v0.13.1`
* Modify gov4alpha plugin to use `go/v4-alpha` from Kubebuilder

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>
@everettraven
(testing): Bump K8S_VERSION for testing to 1.26.0 (#6351)
7183146 
Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
@openshift-merge-robot
Merge pull request openshift#307 from openshift-bot/art-consistency-o…
df931a1 
…penshift-4.14-openshift-enterprise-operator-sdk

Updating openshift-enterprise-operator-sdk images to be consistent with ART
@github-actions @oceanc80
[master] image(ansible-operator): bump base to quay.io/operator-frame…
53c7705 
…work/ansible-operator-base:master-7183146f4b2713be287ece17a3029f1fd0964c1e (#6357)

* [master] image(ansible-operator): bump base to quay.io/operator-framework/ansible-operator-base:master-7183146f4b2713be287ece17a3029f1fd0964c1e

Signed-off-by: oceanc80 <oceanc80@users.noreply.github.com>

* [master] image(ansible-operator-2.11-preview): bump base to quay.io/operator-framework/ansible-operator-2.11-preview-base:master-7183146f4b2713be287ece17a3029f1fd0964c1e (#6358)

Signed-off-by: oceanc80 <oceanc80@users.noreply.github.com>
Co-authored-by: oceanc80 <oceanc80@users.noreply.github.com>

---------

Signed-off-by: oceanc80 <oceanc80@users.noreply.github.com>
Co-authored-by: oceanc80 <oceanc80@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@openshift-merge-robot
Merge pull request openshift#309 from openshift-bot/art-consistency-o…
d356f15 
…penshift-4.14-openshift-enterprise-helm-operator

Updating openshift-enterprise-helm-operator images to be consistent with ART
@oceanc80
Release v1.28.0 (#6359)
5e496a6 
Signed-off-by: Catherine Chan-Tse <cchantse@redhat.com>
@oceanc80
Update OLM bindata to add new version: OLM 0.24.0 (#6360)
484013d 
Signed-off-by: Catherine Chan-Tse <cchantse@redhat.com>
@openshift-merge-robot
Merge pull request openshift#308 from openshift-bot/art-consistency-o…
d59d2f1 
…penshift-4.14-openshift-enterprise-ansible-operator

Updating openshift-enterprise-ansible-operator images to be consistent with ART
@rashmigottipati
Merge upstream tag v1.28.0
faf79fd 
Operator SDK v1.28.0

Merge executed via ./UPSTREAM-MERGE.sh v1.28.0 upstream master

Overwritten conflicts:
go.mod
go.sum
@rashmigottipati
Run go mod tidy
927ed64 
Signed-off-by: Rashmi Gottipati <chowdary.grashmi@gmail.com>
@rashmigottipati
Run go mod vendor
44eb768 
Signed-off-by: Rashmi Gottipati <chowdary.grashmi@gmail.com>
@rashmigottipati
Update SIMPLE_VERSION to v1.28.0-ocp
bfa002d 
Signed-off-by: Rashmi Gottipati <chowdary.grashmi@gmail.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 20, 2023

@rashmigottipati: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[OPECO-2741] Merge upstream tag v1.28.0 to release-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 20, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: rashmigottipati
Once this PR has been reviewed and has the lgtm label, please assign joelanford for approval. For more information see the Kubernetes Code Review Process.

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

@rashmigottipati rashmigottipati changed the title [OPECO-2741] Merge upstream tag v1.28.0 to release-4.13 OCPBUGS-1665: [release-4.13] Merge upstream tag v1.28.0 to release-4.13 Mar 20, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 20, 2023
@openshift-ci-robot
Copy link
Contributor

@rashmigottipati: This pull request references Jira Issue OCPBUGS-1665, which is invalid:

  • expected the bug to target the "4.13.0" version, but no target version was set
  • expected Jira Issue OCPBUGS-1665 to depend on a bug targeting a version in 4.14.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This PR is to downstream the upstream Operator-SDK v1.28.0 release to the release-4.13 branch.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 20, 2023

@rashmigottipati: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

OCPBUGS-1665: [release-4.13] Merge upstream tag v1.28.0 to release-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot mentioned this pull request Mar 21, 2023
Merged
@rashmigottipati rashmigottipati changed the title OCPBUGS-1665: [release-4.13] Merge upstream tag v1.28.0 to release-4.13 [release-4.13] Merge upstream tag v1.28.0 to release-4.13 Mar 22, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 22, 2023

@rashmigottipati: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.13] Merge upstream tag v1.28.0 to release-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot removed jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Mar 22, 2023
@openshift-ci-robot
Copy link
Contributor

@rashmigottipati: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

In response to this:

This PR is to downstream the upstream Operator-SDK v1.28.0 release to the release-4.13 branch.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Mar 22, 2023
@rashmigottipati rashmigottipati deleted the v1.28.0-rebase-master branch March 22, 2023 06:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@everettraven everettraven Awaiting requested review from everettraven

@fabianvf fabianvf Awaiting requested review from fabianvf

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@rashmigottipati @openshift-ci-robot @acornett21 @jberkhahn @everettraven @dharmit @openshift-merge-robot @oceanc80