NO-ISSUE: Synchronize From Upstream Repositories #388
Merged
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
Adds prometheus to the test-e2e Makefile target, which stands up a barebones prometheus scraper to gather metrics from the operator-controller and catalogd pods during the e2e test run. When finished, the prometheus server is queried for a raw output of the metrics and stores it in metrics.out. These metrics will be analyzed in a later PR. Signed-off-by: Daniel Franz <[email protected]>
* Update CRD generator to support experimental CRDs Add support for a new CRD generator. This generator will use `opcon` tags to identify experimental features. A script runs the CRD generation, and creates all the CRDs. New experimental CRDs are now created. Signed-off-by: Todd Short <[email protected]> --------- Signed-off-by: Todd Short <[email protected]>
Signed-off-by: Todd Short <[email protected]>
… (#2038) * Upgrade go version, controller-runtime and k8s dependencies to support k8s 1.33 * Update hack/ci to use go 1.24.3 and latest version in the testdata * Update go version from 1.23 to 1.24 in the tilt
Bumps [github.com/operator-framework/api](https://github.com/operator-framework/api) from 0.31.0 to 0.32.0. - [Release notes](https://github.com/operator-framework/api/releases) - [Changelog](https://github.com/operator-framework/api/blob/master/RELEASE.md) - [Commits](operator-framework/api@v0.31.0...v0.32.0) --- updated-dependencies: - dependency-name: github.com/operator-framework/api dependency-version: 0.32.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/google/go-containerregistry](https://github.com/google/go-containerregistry) from 0.20.3 to 0.20.6. - [Release notes](https://github.com/google/go-containerregistry/releases) - [Changelog](https://github.com/google/go-containerregistry/blob/main/.goreleaser.yml) - [Commits](google/go-containerregistry@v0.20.3...v0.20.6) --- updated-dependencies: - dependency-name: github.com/google/go-containerregistry dependency-version: 0.20.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.17.3 to 3.18.3. - [Release notes](https://github.com/helm/helm/releases) - [Commits](helm/helm@v3.17.3...v3.18.3) --- updated-dependencies: - dependency-name: helm.sh/helm/v3 dependency-version: 3.18.3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Rather than assuming we should use a version of kindest/node based on our version of k8s in go.mod (with a .0 patch), we check to esnure that the version kind uses is compatible with our k8s major.minor version. We discovered this problem because it appears that kindest/node:v1.33.0 has issues with some systems (e.g. Fedora). Using kindest/node:v1.33.1 fixes this issue. So, we don't want to fix a .0 patch version. We want to ensure that the kindest/node image is compatible. Also note that kind never used kindest/node:v1.33.0 as a default image, kind v0.28.0/v0.29.0 use kindest/node:v1.33.1. Signed-off-by: Todd Short <[email protected]>
Now that the version of kubernetes we're using in CI has been increased, Endpoints, which Prometheus uses by default, are deprecated and we need to add configuration to tell Prometheus to use EndpointSlices instead. Signed-off-by: Daniel Franz <[email protected]>
Signed-off-by: grokspawn <[email protected]>
Bumps the k8s-dependencies group with 1 update in the / directory: [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml). Updates `sigs.k8s.io/yaml` from 1.4.0 to 1.5.0 - [Release notes](https://github.com/kubernetes-sigs/yaml/releases) - [Changelog](https://github.com/kubernetes-sigs/yaml/blob/master/RELEASE.md) - [Commits](kubernetes-sigs/yaml@v1.4.0...v1.5.0) --- updated-dependencies: - dependency-name: sigs.k8s.io/yaml dependency-version: 1.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
It's akready part of the catalogd base config. Signed-off-by: Todd Short <[email protected]>
This renames two overlays: * cert-manager -> standard * e2e -> standard-e2e This also adds a new manifest: * manifests/standard-e2e.yaml This fixes the issue with the current test-e2e modifying the standard manifest with e2e parameters, leaving a dirty workspace. This changes the manifest used by the e2e test to be it's own standard-e2e manifest. This is part of the feature-gated API functionality. Signed-off-by: Todd Short <[email protected]>
Move the current feature overlays to be components. This will allow them to be brought into an experimental overlay in the near future. These are currently unused. This is part of the feature-gated API functionality. Signed-off-by: Todd Short <[email protected]>
This makes it easier to manage the e2e components as a single unit. This is part of the feature-gated API functionality. Signed-off-by: Todd Short <[email protected]>
This renames the tls component to cert-manager to reflect what it really is. A kustomization.yaml file is added to cert-manager to make it behave as a single component. This will make it easier to manage this component, and allow for easier future replacement. This is part of the feature-gated API functionality. Signed-off-by: Todd Short <[email protected]>
At the root of each CRD directory, there is a kustomization file. Replicate this into the individual directories, so that they can be referenced directly by overlays. This keeps the "default" reference of `config/base/.../crd` to be the standard CRD for compatibility with existing overlays. The kustomizeconfig.yaml file is not used, and is deleted. This is part of the feature-gated API functionality. Signed-off-by: Todd Short <[email protected]>
Bumps [lxml](https://github.com/lxml/lxml) from 5.4.0 to 6.0.0. - [Release notes](https://github.com/lxml/lxml/releases) - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt) - [Commits](lxml/lxml@lxml-5.4.0...lxml-6.0.0) --- updated-dependencies: - dependency-name: lxml dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This adds `manifests/experimental.yaml` The difference between the experimental manifest and the standard manifest is the presence of the experimental CRD vs the standard CRD (as of right now there is only a difference in annotations), and the feature-gated components. This change supports defining feature components in _exactly_ one place: * GA'd features are put into `components/base/common` * Feature-Gated/Experimental/TechPreview features are put into `components/base/experimental` This adds new components to make constructing the overlays easier: `components/base/common` includes everything but CRDs and experimental features: * `base/catalog` (but not CRDs) * `base/operator-controller` (but not CRDs) * `base/common` * GA'd features (currently none) `components/base/standard` adds the standard CRD: * `component/base/common` component * standard CRDs `components/base/experimental` includes the experimental CRDs and features: * `component/base/common` component * experimental CRDs * experimental (non-GA'd) features: - `components/features/synthetic-user-permissions` - `components/features/webhook-provider-certmanager` - `components/features/webhook-provider-openshift-serviceca` By necessity, this removes the crd from the `config/base/.../kustomization.yaml` files. These `kustomization.yaml` files define the namespace and prefix for resources, so we need to continue to reference them. Since the CRDs do not have a namespace, and do not use the prefix, the `crd` directory can be removed. Fix the basic-olm overlay to use the new standard component Add new `run-experimental` target, to run with the experimental manifest. This is part of the feature-gated API functionality. Signed-off-by: Todd Short <[email protected]>
* Add experimental e2e tests This adds `manifests/experimental-e2e.yaml`, and uses it to run the experimental-e2e. The experimental-e2e is run via `make test-experimental-e2e` and a CI job is added to run it. A "no-op" experimental-e2e test has been added. This is part of the feature-gated API functionality. Signed-off-by: Todd Short <[email protected]> * fixup! Add experimental e2e tests Signed-off-by: Todd Short <[email protected]> * fixup! Add experimental e2e tests Signed-off-by: Todd Short <[email protected]> --------- Signed-off-by: Todd Short <[email protected]>
openshift-bot
added
tide/merge-method-merge
openshift-ci-robot
added
the
jira/valid-reference
openshift-bot
added
the
do-not-merge/hold
|
@openshift-bot: This pull request explicitly references no jira issue. DetailsIn 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. |
…he caller (follow-up 345)
…s with right permissions to avoid issues scenarios
…ements of initial implementation
Signed-off-by: Jian Zhang <[email protected]>
Signed-off-by: Todd Short <[email protected]>
…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
…uite and small cleanups
…ge to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-olm-operator-controller.yml
Update the e2e registry Dockerfile to use golang 1.24/OCP 4.20 Signed-off-by: Todd Short <[email protected]>
openshift-bot
force-pushed
the
synchronize-upstream
branch
from
1b87f69 to
aa36335
Compare
Member
|
/unhold |
openshift-ci
bot
removed
the
do-not-merge/hold
Member
|
/lgtm |
Contributor
|
@openshift-bot: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
Author
|
[ART PR BUILD NOTIFIER] Distgit: ose-olm-operator-controller |
Author
|
[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
8 participants
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