search

openshift / ocp-release-operator-sdk

Apache License 2.0
16 stars 39 forks source link

Merge upstream tag v1.13.1 #168

Closed fabianvf closed 3 years ago

fabianvf commented 3 years ago

Operator SDK v1.13.1

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

Overwritten conflicts: Makefile go.mod go.sum internal/plugins/helm/v1/init.go testdata/ansible/memcached-operator/Dockerfile testdata/ansible/memcached-operator/Makefile testdata/ansible/memcached-operator/bundle/tests/scorecard/config.yaml testdata/ansible/memcached-operator/config/scorecard/patches/basic.config.yaml testdata/ansible/memcached-operator/config/scorecard/patches/olm.config.yaml testdata/go/v2/memcached-operator/bundle/tests/scorecard/config.yaml testdata/go/v2/memcached-operator/config/scorecard/patches/basic.config.yaml testdata/go/v2/memcached-operator/config/scorecard/patches/olm.config.yaml testdata/go/v3/memcached-operator/Makefile testdata/go/v3/memcached-operator/bundle/tests/scorecard/config.yaml testdata/go/v3/memcached-operator/config/scorecard/patches/basic.config.yaml testdata/go/v3/memcached-operator/config/scorecard/patches/olm.config.yaml testdata/helm/memcached-operator/Dockerfile testdata/helm/memcached-operator/Makefile testdata/helm/memcached-operator/bundle/tests/scorecard/config.yaml testdata/helm/memcached-operator/config/scorecard/patches/basic.config.yaml testdata/helm/memcached-operator/config/scorecard/patches/olm.config.yaml website/content/en/docs/faqs/_index.md website/content/en/docs/installation/_index.md

Description of the change:

Motivation for the change:

Checklist

If the pull request includes user-facing changes, extra documentation is required:

jmrodri commented 3 years ago

/test e2e-aws-ansible

jmrodri commented 3 years ago

/test e2e-aws-helm

openshift-ci[bot] commented 3 years ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabianvf, jmrodri

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: - ~~[OWNERS](https://github.com/openshift/ocp-release-operator-sdk/blob/master/OWNERS)~~ [fabianvf,jmrodri] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment