OPRUN-3957: Synchronize From Upstream Repositories #382
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updates the docs around metrics gathering to include necessary NetworkPolicy, fixes some errors in the ServiceMonitor yaml for securityContext and catalogd labels, and makes the example curl commands easier to execute. Signed-off-by: Daniel Franz <dfranz@redhat.com>
Check-in manifests to the manifests directory. Currently, there is: * "standard" manifests, which is used as the basis for e2e and quickstart * "cluster-catalogs" manifests, which is just moved from the config dir Signed-off-by: Todd Short <tshort@redhat.com>
Signed-off-by: Todd Short <tshort@redhat.com>
* Support serviceaccount pull secrets Serviceaccounts reference pull secrets! * Determine our serviceaccount (via the new internal/shared/util/sa package). * Use a common pull_secret_controller * Update the pull_secret_controller to know about the service account * Update the pull_secret_controller to watch the namespace-local secrets * Update caching to include sa, and use filters for additional secrets * Add RBAC to access these secrets and sa * Update writing the auth.json file to handle dockercfg and dockerconfigjson * Update writing the auth.json file to include multiple secrets Signed-off-by: Todd Short <tshort@redhat.com> * fixup! Support serviceaccount pull secrets Signed-off-by: Todd Short <tshort@redhat.com> * fixup! Support serviceaccount pull secrets Signed-off-by: Todd Short <tshort@redhat.com> * fixup! Support serviceaccount pull secrets Signed-off-by: Todd Short <tshort@redhat.com> * fixup! Support serviceaccount pull secrets * fixup! Support serviceaccount pull secrets * fixup! Support serviceaccount pull secrets Signed-off-by: Todd Short <tshort@redhat.com> * fixup! Support serviceaccount pull secrets Signed-off-by: Todd Short <tshort@redhat.com> --------- Signed-off-by: Todd Short <tshort@redhat.com>
Signed-off-by: dtfranz <dfranz@redhat.com> UPSTREAM: <carry>: Update generate-manifests to handle new directory The `default` directory was renamed `base`. Signed-off-by: Todd Short <todd.short@me.com> The `base` directory was moved to `base\operator-controller`. Signed-off-by: Todd Short <todd.short@me.com> UPSTREAM: <carry>: Drop commitchecker Signed-off-by: Alexander Greene <greene.al1991@gmail.com> UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-operator-controller.yml UPSTREAM: <carry>: update owners * Remove alumni from owners * Add m1kola to approvers Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com> UPSTREAM: <carry>: Add pointer to tooling README UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com> UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/6250d54c4686a708ca5985afb73080e8ca9a1f7f/images/ose-olm-operator-controller.yml UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream * This reverts commit 3f079c4. * Includes Validating Admission Policy manifests Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com> UPSTREAM: <carry>: manifests: set required-scc for openshift workloads UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-olm-operator-controller.yml UPSTREAM: <carry>: add everettraven to approvers+reviewers Signed-off-by: everettraven <everettraven@gmail.com> UPSTREAM: <carry>: add openshift kustomize overlay to enable TLS communication with catalogd. Configure the CA certs using the configmap injection method via service-ca-operator Signed-off-by: everettraven <everettraven@gmail.com> UPSTREAM: <carry>: Add tmshort to approvers Also `s/runtime/framework/g` in the DOWNSTREAM_OWNERS Signed-off-by: Todd Short <todd.short@me.com> UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/dd68246f3237db5db458127566fc7b05b55e1660/images/ose-olm-operator-controller.yml UPSTREAM: <carry>: Properly copy and call kustomize Signed-off-by: Todd Short <todd.short@me.com> UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers Signed-off-by: Joe Lanford <joe.lanford@gmail.com> UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release. Signed-off-by: dtfranz <dfranz@redhat.com> UPSTREAM: <carry>: Add downstream verify makefile target Signed-off-by: dtfranz <dfranz@redhat.com> UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator Signed-off-by: Joe Lanford <joe.lanford@gmail.com> UPSTREAM: <carry>: Add global-pull-secret flag Pass global-pull-secret to the manager container. Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com> UPSTREAM: <carry>: Update openshift CAs to operator-controller The /run/secrets/kubernetes.io/serviceaccount/ directory is projected into the pod and contains the following CA certificates: * configmap/kube-root-ca.crt as ca.crt * configmap/openshift-service-ca.crt as service-ca.crt Update the --ca-certs-dir argument to reference the directory. Signed-off-by: Todd Short <todd.short@me.com> UPSTREAM: <carry>: Add HowTo for origin tests Signed-off-by: Todd Short <todd.short@me.com> UPSTREAM: <carry>: Add e2e registry Dockerfile Signed-off-by: dtfranz <dfranz@redhat.com> UPSTREAM: <carry>: add nodeSelector and tolerations to operator-controller deployment via kustomize patch Signed-off-by: everettraven <everettraven@gmail.com> UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels Signed-off-by: Joe Lanford <joe.lanford@gmail.com> UPSTREAM: <carry>: Enable downstream e2e Signed-off-by: dtfranz <dfranz@redhat.com> UPSTREAM: <carry>: Remove m1kola from owners Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com> UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-olm-operator-controller.yml UPSTREAM: <carry>: generate and mount service-ca server cert Signed-off-by: Joe Lanford <joe.lanford@gmail.com> UPSTREAM: <carry>: Add support for proxy trustedCAs Just map the list of trusted ca certs into the deployment Signed-off-by: Todd Short <todd.short@me.com> UPSTREAM: <carry>: Fix error to build the image Copy correct (new) executable name for operator-controller Signed-off-by: Todd Short <todd.short@me.com> UPSTREAM: <carry>: Fix make verify for mac os envs Joe Lanford <joe.lanford@gmail.com> UPSTREAM: <carry>: Move operator-controller openshift files to its own dir UPSTREAM: <carry>: Upgrade OCP images from 4.18 to 4.19 UPSTREAM: <carry>: Add Openshift's catalogd manifests - Move to openshift/catalogd the specific manifest under: https://github.com/openshift/operator-framework-catalogd/tree/main/openshift - Add call to generate catalogd manifest to 'make manifest'. Make verify test is now done for catalogd and operator-controller Openshift's manifests UPSTREAM: <carry>: resolve issue with pre-mature mounting of trusted CA configmap Signed-off-by: Joe Lanford <joe.lanford@gmail.com> UPSTREAM: <carry>: Add /etc/docker to the operator-controller and catalogd deployments This allows for use of the any image.config.openshift.io trusted CAs Signed-off-by: Todd Short <todd.short@me.com> UPSTREAM: <carry>: fixup catalogd.Dockerfile paths Signed-off-by: Joe Lanford <joe.lanford@gmail.com> UPSTREAM: <carry>: Resolve issue with pre-mature mounting of service CA configmap Signed-off-by: Todd Short <todd.short@me.com> UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations Signed-off-by: Joe Lanford <joe.lanford@gmail.com> UPSTREAM: <carry>: Revert "UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations" This reverts commit 548caa4. UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations Signed-off-by: Joe Lanford <joe.lanford@gmail.com> UPSTREAM: <carry>: Remove vet from openshift verify The `vet` target was removed upstream. Signed-off-by: Todd Short <todd.short@me.com> UPSTREAM: <carry>: Skip another upstream test Signed-off-by: Todd Short <todd.short@me.com> UPSTREAM: <carry>: Cleanup openshift/Makefile by removing no longer required comments regards catalogd e2e tests UPSTREAM: <carry>: Enable OCP metrics collection by default Enables OCP to collect Prometheus metrics for both catalogd and operator-controller by default. This is accomplished via ServiceMonitor CRs which are now created for both projects.
The root catalogd directory has been removed Signed-off-by: Todd Short <todd.short@me.com>
Signed-off-by: Todd Short <todd.short@me.com>
Signed-off-by: Catherine Chan-Tse <cchantse@redhat.com> (cherry picked from commit 9b4a113)
Signed-off-by: Todd Short <todd.short@me.com>
Signed-off-by: Jian Zhang <jiazha@redhat.com>
Signed-off-by: Todd Short <todd.short@me.com>
This reverts commit a98980b.
techpreview is no longer a required option. Signed-off-by: Todd Short <todd.short@me.com>
… docker credentials"
…he caller (follow-up 345)
…s with right permissions to avoid issues scenarios
…ements of initial implementation
Signed-off-by: Jian Zhang <jiazha@redhat.com>
Signed-off-by: Todd Short <todd.short@me.com>
…k for executable files in filesystem Checks if given paths exist and point to executable files or valid symlinks.
…ut format to allow generate xml
…k to validate multi-arch support
openshift-bot
added
tide/merge-method-merge
openshift-ci-robot
added
the
jira/valid-reference
openshift-bot
added
the
approved
|
@openshift-bot: This pull request explicitly references no jira issue. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
@openshift-bot: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-framework. Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs. In response to this:
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-sigs/prow repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: openshift-bot The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
1 similar comment
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: openshift-bot The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retitle OPRUN-3957: Synchronize From Upstream Repositories |
openshift-ci
bot
changed the title
|
@openshift-bot: This pull request references OPRUN-3957 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
@openshift-bot: The following test failed, say
Full PR test history. Your PR dashboard. 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-sigs/prow repository. I understand the commands that are listed here. |
|
A basic test pass, LGTM. 1, remove global pull-secret
jiazha-mac:~ jiazha$ oc delete secret/pull-secret -n openshift-config
secret "pull-secret" deleted
2, check logs, looks good.
I0613 03:04:05.799107 1 controller.go:248] "Starting workers" controller="catalogd-pull-secret-controller" controllerGroup="" controllerKind="Secret" worker count=1
I0613 03:04:05.799352 1 pull_secret_controller.go:95] "saved global pull secret data locally" controller="catalogd-pull-secret-controller" controllerGroup="" controllerKind="Secret" Secret="openshift-config/pull-secret" namespace="openshift-config" name="pull-secret" reconcileID="593ce48b-d574-4cf5-8d97-00d83c9c1ee6"
I0613 03:11:32.702767 1 reflector.go:879] pkg/cache/internal/informers.go:108: Watch close - *v1.Secret total 9 items received
I0613 03:12:31.701994 1 reflector.go:879] pkg/cache/internal/informers.go:108: Watch close - *v1.ClusterCatalog total 10 items received
I0613 03:13:37.773501 1 reflector.go:879] pkg/cache/internal/informers.go:108: Watch close - *v1.Secret total 2 items received
I0613 03:13:37.801392 1 reflector.go:879] pkg/cache/internal/informers.go:108: Watch close - *v1.ClusterCatalog total 1 items received
...
...
I0613 08:16:59.731358 1 reflector.go:879] pkg/cache/internal/informers.go:108: Watch close - *v1.ClusterCatalog total 10 items received
I0613 08:18:28.286100 1 pull_secret_controller.go:53] "secret not found" controller="catalogd-pull-secret-controller" controllerGroup="" controllerKind="Secret" Secret="openshift-config/pull-secret" namespace="openshift-config" name="pull-secret" reconcileID="4ef5d96c-ad6f-4b0f-86d7-0a76763426e0"
I0613 08:18:28.286119 1 pull_secret_controller.go:101] "deleting local auth file" controller="catalogd-pull-secret-controller" controllerGroup="" controllerKind="Secret" Secret="openshift-config/pull-secret" namespace="openshift-config" name="pull-secret" reconcileID="4ef5d96c-ad6f-4b0f-86d7-0a76763426e0" file="/tmp/catalogd-global-pull-secret-f2jlpngn.json"
I0613 08:18:28.286220 1 pull_secret_controller.go:109] "auth file deleted successfully" controller="catalogd-pull-secret-controller" controllerGroup="" controllerKind="Secret" Secret="openshift-config/pull-secret" namespace="openshift-config" name="pull-secret" reconcileID="4ef5d96c-ad6f-4b0f-86d7-0a76763426e0"
I0613 08:21:55.345944 1 pull_secret_controller.go:95] "saved global pull secret data locally" controller="catalogd-pull-secret-controller" controllerGroup="" controllerKind="Secret" Secret="openshift-config/pull-secret" namespace="openshift-config" name="pull-secret" reconcileID="b0ce1e27-19a2-4d72-9446-982270509078"
3, recover global pull-secret
jiazha-mac:~ jiazha$ oc create -f pull-secret.yaml
secret/pull-secret created
4, install a clusterextension.
jiazha-mac:~ jiazha$ oc create -f ce-camel.yaml
serviceaccount/camel-k created
clusterrolebinding.rbac.authorization.k8s.io/camel-k-role-binding created
clusterextension.olm.operatorframework.io/extension-camel created
jiazha-mac:~ jiazha$ oc get clusterextension
NAME INSTALLED BUNDLE VERSION INSTALLED PROGRESSING AGE
extension-camel camel-k-operator.v2.6.0 2.6.0 True True 10s/label qe-approved |
openshift-ci
bot
added
qe-approved
|
@openshift-bot: This pull request references OPRUN-3957 which is a valid jira issue. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
openshift-merge-bot
bot
merged commit ca05ff8
into
openshift:main
9 of 10 checks passed
|
[ART PR BUILD NOTIFIER] Distgit: ose-olm-operator-controller |
|
[ART PR BUILD NOTIFIER] Distgit: ose-olm-catalogd |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The downstream repository has been updated through the following upstream commit:
The
vendor/directory has been updated and the following commits were carried:This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.
/cc @openshift/openshift-team-operator-framework