-
Notifications
You must be signed in to change notification settings - Fork 344
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into multi-options
- Loading branch information
Showing
16 changed files
with
326 additions
and
166 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| Thanks submitting your Operator. Please check below list before you create your Pull Request. | ||
|
|
||
| ### New Submissions | ||
|
|
||
| * [x] Are you familiar with our [contribution guidelines](https://github.com/operator-framework/community-operators/blob/master/docs/contributing-via-pr.md)? | ||
| * [x] Have you [packaged and deployed](https://github.com/operator-framework/community-operators/blob/master/docs/testing-operators.md) your Operator for Operator Framework? | ||
| * [x] Have you tested your Operator with all Custom Resource Definitions? | ||
| * [x] Have you tested your Operator in all supported [installation modes](https://github.com/operator-framework/operator-lifecycle-manager/blob/master/doc/design/building-your-csv.md#operator-metadata)? | ||
| * [x] Have you considered whether you want use [semantic versioning order](https://github.com/operator-framework/community-operators/blob/master/docs/operator-ci-yaml.md#semver-mode)? | ||
| * [x] Is your submission [signed](https://github.com/operator-framework/community-operators/blob/master/docs/contributing-prerequisites.md#sign-your-work)? | ||
| * [x] Is operator [icon](https://github.com/operator-framework/community-operators/blob/master/docs/packaging-operator.md#operator-icon) set? | ||
|
|
||
| ### Updates to existing Operators | ||
|
|
||
| * [x] Did you create a `ci.yaml` file according to the [update instructions](https://github.com/operator-framework/community-operators/blob/master/docs/operator-ci-yaml.md)? | ||
| * [x] Is your new CSV pointing to the previous version with the `replaces` property if you chose `replaces-mode` via the `updateGraph` property in `ci.yaml`? | ||
| * [x] Is your new CSV referenced in the [appropriate channel](https://github.com/operator-framework/community-operators/blob/master/docs/packaging-operator.md#channels) defined in the `package.yaml` or `annotations.yaml` ? | ||
| * [ ] Have you tested an update to your Operator when deployed via OLM? | ||
| * [x] Is your submission [signed](https://github.com/operator-framework/community-operators/blob/master/docs/contributing-prerequisites.md#sign-your-work)? | ||
|
|
||
| ### Your submission should not | ||
|
|
||
| * [x] Modify more than one operator | ||
| * [x] Modify an Operator you don't own | ||
| * [x] Rename an operator - please remove and add with a different name instead | ||
| * [x] Submit operators to both `upstream-community-operators` and `community-operators` at once | ||
| * [x] Modify any files outside the above mentioned folders | ||
| * [x] Contain more than one commit. **Please squash your commits.** | ||
|
|
||
| ### Operator Description must contain (in order) | ||
|
|
||
| 1. [x] Description about the managed Application and where to find more information | ||
| 2. [x] Features and capabilities of your Operator and how to use it | ||
| 3. [x] Any manual steps about potential pre-requisites for using your Operator | ||
|
|
||
| ### Operator Metadata should contain | ||
|
|
||
| * [x] Human readable name and 1-liner description about your Operator | ||
| * [x] Valid [category name](https://github.com/operator-framework/community-operators/blob/master/docs/packaging-operator.md#categories)<sup>1</sup> | ||
| * [x] One of the pre-defined [capability levels](https://github.com/operator-framework/operator-courier/blob/4d1a25d2c8d52f7de6297ec18d8afd6521236aa2/operatorcourier/validate.py#L556)<sup>2</sup> | ||
| * [x] Links to the maintainer, source code and documentation | ||
| * [x] Example templates for all Custom Resource Definitions intended to be used | ||
| * [x] A quadratic logo | ||
|
|
||
| Remember that you can preview your CSV [here](https://operatorhub.io/preview). | ||
|
|
||
| -- | ||
|
|
||
| <sup>1</sup> If you feel your Operator does not fit any of the pre-defined categories, file an issue against this repo and explain your need | ||
|
|
||
| <sup>2</sup> For more information see [here](https://sdk.operatorframework.io/docs/overview/#operator-capability-level) |
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,25 @@ | ||
| #!/bin/bash | ||
|
|
||
| if [ -z ${COMMUNITY_OPERATORS_REPOSITORY} ]; then | ||
| COMMUNITY_OPERATORS_REPOSITORY="$(dirname $(dirname $(pwd)))/operator-framework/community-operators" | ||
| echo "COMMUNITY_OPERATORS_REPOSITORY not set, using ${COMMUNITY_OPERATORS_REPOSITORY}" | ||
|
|
||
| COMMUNITY_OPERATORS_REPOSITORY="k8s-operatorhub/community-operators" | ||
| UPSTREAM_REPOSITORY="redhat-openshift-ecosystem/community-operators-prod" | ||
| LOCAL_REPOSITORIES_PATH=${LOCAL_REPOSITORIES_PATH:-"$(dirname $(dirname $(pwd)))"} | ||
|
|
||
|
|
||
| if [[ ! -d "${LOCAL_REPOSITORIES_PATH}/${COMMUNITY_OPERATORS_REPOSITORY}" ]]; then | ||
| echo "${LOCAL_REPOSITORIES_PATH}/${COMMUNITY_OPERATORS_REPOSITORY} doesn't exist, aborting." | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [ ! -d ${COMMUNITY_OPERATORS_REPOSITORY} ]; then | ||
| echo "${COMMUNITY_OPERATORS_REPOSITORY} doesn't exist, aborting." | ||
| if [[ ! -d "${LOCAL_REPOSITORIES_PATH}/${UPSTREAM_REPOSITORY}" ]]; then | ||
| echo "${LOCAL_REPOSITORIES_PATH}/${UPSTREAM_REPOSITORY} doesn't exist, aborting." | ||
| exit 1 | ||
| fi | ||
|
|
||
|
|
||
| OLD_PWD=$(pwd) | ||
| VERSION=$(grep operator= versions.txt | awk -F= '{print $2}') | ||
|
|
||
| PKG_FILE=deploy/olm-catalog/jaeger-operator/jaeger-operator.package.yaml | ||
| CSV_FILE=deploy/olm-catalog/jaeger-operator/manifests/jaeger-operator.clusterserviceversion.yaml | ||
| CRD_FILE=deploy/crds/jaegertracing.io_jaegers_crd.yaml | ||
|
|
@@ -21,104 +29,42 @@ CRD_FILE=deploy/crds/jaegertracing.io_jaegers_crd.yaml | |
| DEST_PKG_FILE=jaeger.package.yaml | ||
| DEST_CSV_FILE=jaeger.v${VERSION}.clusterserviceversion.yaml | ||
|
|
||
| cd "${COMMUNITY_OPERATORS_REPOSITORY}" | ||
|
|
||
| git remote | grep upstream > /dev/null | ||
| if [ $? != 0 ]; then | ||
| echo "Cannot find a remote named 'upstream'. Adding one." | ||
| git remote add upstream [email protected]:operator-framework/community-operators.git | ||
| fi | ||
|
|
||
| git fetch -q upstream | ||
| git checkout -q master | ||
| git rebase -q upstream/master | ||
| for dest in ${COMMUNITY_OPERATORS_REPOSITORY} ${UPSTREAM_REPOSITORY}; do | ||
| cd "${LOCAL_REPOSITORIES_PATH}/${dest}" | ||
| git remote | grep upstream > /dev/null | ||
| if [[ $? != 0 ]]; then | ||
| echo "Cannot find a remote named 'upstream'. Adding one." | ||
| git remote add upstream [email protected]:${dest}.git | ||
| fi | ||
|
|
||
| for dest in upstream-community-operators community-operators; do | ||
| mkdir -p "${COMMUNITY_OPERATORS_REPOSITORY}/${dest}/jaeger/${VERSION}" | ||
| git fetch -q upstream | ||
| git checkout -q main | ||
| git rebase -q upstream/main | ||
|
|
||
| cp "${OLD_PWD}/${PKG_FILE}" "${COMMUNITY_OPERATORS_REPOSITORY}/${dest}/jaeger/${DEST_PKG_FILE}" | ||
| cp "${OLD_PWD}/${CSV_FILE}" "${COMMUNITY_OPERATORS_REPOSITORY}/${dest}/jaeger/${VERSION}/${DEST_CSV_FILE}" | ||
| cp "${OLD_PWD}/${CRD_FILE}" "${COMMUNITY_OPERATORS_REPOSITORY}/${dest}/jaeger/${VERSION}" | ||
| mkdir -p "${dest}/operators/jaeger/${VERSION}" | ||
|
|
||
| git checkout -q master | ||
| cp "${OLD_PWD}/${PKG_FILE}" "${dest}/operators/jaeger/${DEST_PKG_FILE}" | ||
| cp "${OLD_PWD}/${CSV_FILE}" "${dest}/operators/jaeger/${VERSION}/${DEST_CSV_FILE}" | ||
| cp "${OLD_PWD}/${CRD_FILE}" "${dest}/operators/jaeger/${VERSION}" | ||
|
|
||
| git checkout -q -b Update-Jaeger-${dest}-to-${VERSION} | ||
| if [ $? != 0 ]; then | ||
| git checkout -q -b Update-Jaeger-to-${VERSION} | ||
| if [[ $? != 0 ]]; then | ||
| echo "Cannot switch to the new branch Update-Jaeger-${dest}-to-${VERSION}. Aborting" | ||
| exit 1 | ||
| fi | ||
|
|
||
| git add "${COMMUNITY_OPERATORS_REPOSITORY}/${dest}/" | ||
| git commit -sqm "Update Jaeger ${dest} to v${VERSION}" | ||
| git push -q | ||
| git add ${dest} | ||
| git commit -sqm "Update Jaeger to v${VERSION}" | ||
|
|
||
|
|
||
| command -v hub > /dev/null | ||
| if [ $? != 0 ]; then | ||
| echo "'hub' command not found, can't submit the PR on your behalf." | ||
| command -v gh > /dev/null | ||
| if [[ $? != 0 ]]; then | ||
| echo "'gh' command not found, can't submit the PR on your behalf." | ||
| break | ||
| fi | ||
|
|
||
| tmpfile=$(mktemp /tmp/Update-Jaeger-${dest}-to-${VERSION}.XXX) | ||
| cat > ${tmpfile} <<- EOM | ||
| Update Jaeger ${dest} to v${VERSION} | ||
| Thanks submitting your Operator. Please check below list before you create your Pull Request. | ||
| ### New Submissions | ||
| * [x] Does your operator have [nested directory structure](https://github.com/operator-framework/community-operators/blob/master/docs/contributing.md#create-a-bundle)? | ||
| * [x] Have you selected the Project *Community Operator Submissions* in your PR on the right-hand menu bar? | ||
| * [x] Are you familiar with our [contribution guidelines](https://github.com/operator-framework/community-operators/blob/master/docs/contributing.md)? | ||
| * [x] Have you [packaged and deployed](https://github.com/operator-framework/community-operators/blob/master/docs/testing-operators.md) your Operator for Operator Framework? | ||
| * [x] Have you tested your Operator with all Custom Resource Definitions? | ||
| * [x] Have you tested your Operator in all supported [installation modes](https://github.com/operator-framework/operator-lifecycle-manager/blob/master/doc/design/building-your-csv.md#operator-metadata)? | ||
| * [x] Have you considered whether you want use [semantic versioning order](https://github.com/operator-framework/community-operators/blob/master/docs/contributing.md#updating-your-existing-operator)? | ||
| * [x] Is your submission [signed](https://github.com/operator-framework/community-operators/blob/master/docs/contributing.md#sign-your-work)? | ||
| * [x] Is operator [icon](https://github.com/operator-framework/community-operators/blob/master/docs/contributing.md#operator-icon) set? | ||
| ### Updates to existing Operators | ||
| * [x] Did you create a ci.yaml file according to the [update instructions](https://github.com/operator-framework/community-operators/blob/master/docs/contributing.md#updating-your-existing-operator)? | ||
| * [x] Is your new CSV pointing to the previous version with the replaces property if you chose replaces-mode via the updateGraph property in ci.yaml? | ||
| * [x] Is your new CSV referenced in the [appropriate channel](https://github.com/operator-framework/community-operators/blob/master/docs/contributing.md#bundle-format) defined in the package.yaml or annotations.yaml ? | ||
| * [ ] Have you tested an update to your Operator when deployed via OLM? | ||
| * [x] Is your submission [signed](https://github.com/operator-framework/community-operators/blob/master/docs/contributing.md#sign-your-work)? | ||
| ### Your submission should not | ||
| * [x] Modify more than one operator | ||
| * [x] Modify an Operator you don't own | ||
| * [x] Rename an operator - please remove and add with a different name instead | ||
| * [x] Submit operators to both upstream-community-operators and community-operators at once | ||
| * [x] Modify any files outside the above mentioned folders | ||
| * [x] Contain more than one commit. **Please squash your commits.** | ||
| ### Operator Description must contain (in order) | ||
| 1. [x] Description about the managed Application and where to find more information | ||
| 2. [x] Features and capabilities of your Operator and how to use it | ||
| 3. [x] Any manual steps about potential pre-requisites for using your Operator | ||
| ### Operator Metadata should contain | ||
| * [x] Human readable name and 1-liner description about your Operator | ||
| * [x] Valid [category name](https://github.com/operator-framework/community-operators/blob/master/docs/required-fields.md#categories)<sup>1</sup> | ||
| * [x] One of the pre-defined [capability levels](https://github.com/operator-framework/operator-courier/blob/4d1a25d2c8d52f7de6297ec18d8afd6521236aa2/operatorcourier/validate.py#L556)<sup>2</sup> | ||
| * [x] Links to the maintainer, source code and documentation | ||
| * [x] Example templates for all Custom Resource Definitions intended to be used | ||
| * [x] A quadratic logo | ||
| Remember that you can preview your CSV [here](https://operatorhub.io/preview). | ||
| -- | ||
| <sup>1</sup> If you feel your Operator does not fit any of the pre-defined categories, file an issue against this repo and explain your need | ||
| <sup>2</sup> For more information see [here](https://github.com/operator-framework/operator-sdk/blob/master/doc/images/operator-capability-level.svg) | ||
| EOM | ||
|
|
||
| echo "Submitting PR on your behalf via 'hub'" | ||
| hub pull-request -F ${tmpfile} | ||
| gh pr create --title "Update Jaeger to v${VERSION}" --body-file "${OLD_PWD}/.ci/.checked-pr-template.md" | ||
| rm ${tmpfile} | ||
| done | ||
|
|
||
|
|
||
This file contains 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
This file contains 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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
Oops, something went wrong.