Bug 1950113: manifests: populate aws user tags in infrastructure #4755

staebler · 2021-03-15T21:18:16Z

Add the platform.aws.experimentalPropagateUserTags field to the install config. When the field is true, fill out the new status.platformStatus.aws.resourceTags field in the manifest for the infrastructure resource.

openshift/enhancements#706

staebler · 2021-03-15T21:18:25Z

/hold for openshift/api#864

staebler · 2021-03-16T01:47:14Z

$ <$INST_DIR/install-config.yaml yq -y '.platform.aws.userTags'
first-key: first-value
secondKey: secondValue

$ openshift-install create manifests --dir $INST_DIR

$ <$INST_DIR/manifests/cluster-infrastructure-02-config.yml yq -y '.spec.platformSpec'
aws:
  userTags:
    - key: first-key
      value: first-value
    - key: secondKey
      value: secondValue
type: AWS

openshift-ci-robot · 2021-03-27T21:31:27Z

@staebler: PR needs rebase.

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.

gregsheremeta · 2021-04-20T19:56:14Z

👀

openshift-ci-robot · 2021-04-21T05:19:00Z

@staebler: This pull request references Bugzilla bug 1950113, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.8.0) matches configured target release for branch (4.8.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (pamoedom@redhat.com), skipping review request.

In response to this:

Bug 1950113: manifests: populate aws user tags in infrastructure

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.

staebler · 2021-04-21T05:19:34Z

/unhold

openshift/api#864 has merged

mtnbikenc · 2021-04-21T12:31:54Z

Given the amount of validation required in implementation, it could be tricky to get this right. Is user documentation included in a docs PR?

LGTM

gregsheremeta · 2021-04-21T13:13:13Z

after speaking with PX and Docs, because we're using experimental, we're not going to document it yet.

frobware · 2021-04-22T10:20:13Z

/retest

frobware · 2021-04-22T10:20:58Z

/skip

mtnbikenc · 2021-04-22T15:45:12Z

after speaking with PX and Docs, because we're using experimental, we're not going to document it yet.

Sounds good.
/lgtm

staebler · 2021-04-22T15:55:46Z

/approve

openshift-ci-robot · 2021-04-22T15:56:06Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: staebler

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~~ [staebler]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Bump github.com/openshift/api to pick up AWS resource tags in the infrastructure.config.openshift.io CRD. * upgrade kubernetes modules to v0.21.0-rc.0 * pin sigs.k8s.io/controller-runtime to v0.9.0-alpha.1

Add the `platform.aws.experimentalPropagateUserTags` field to the install config. When the field is true, fill out the new `.status.platformStatus.aws.resourceTags` field in the manifest for the infrastructure resource. https://issues.redhat.com/browse/CORS-1657

patrickdillon · 2021-04-22T21:14:16Z

/retest

patrickdillon · 2021-04-22T21:21:37Z

/lgtm

staebler · 2021-04-23T03:46:53Z

/hold cancel

openshift-bot · 2021-04-23T04:18:14Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-04-23T06:07:06Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-04-23T06:54:43Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-04-23T08:13:56Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-04-23T11:49:42Z

/retest

Please review the full test history for this PR and help us cut down flakes.

staebler · 2021-04-23T22:58:56Z

/retest

openshift-bot · 2021-04-24T08:20:51Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-04-24T10:29:15Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-04-24T14:35:26Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-04-24T16:33:41Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2021-04-24T17:38:09Z

@staebler: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/e2e-libvirt	`2033421`	link	`/test e2e-libvirt`

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/test-infra repository. I understand the commands that are listed here.

openshift-bot · 2021-04-24T17:45:44Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci-robot · 2021-04-24T18:02:15Z

@staebler: Some pull requests linked via external trackers have merged:

openshift/api#864

The following pull requests linked via external trackers have not merged:

openshift/api#905 is open

These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state. Once unlinked, request a bug refresh with /bugzilla refresh.

Bugzilla bug 1950113 has not been moved to the MODIFIED state.

In response to this:

Bug 1950113: manifests: populate aws user tags in infrastructure

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.

staebler · 2021-04-27T17:03:15Z

/cherry-pick release-4.7

openshift-cherrypick-robot · 2021-04-27T17:04:09Z

@staebler: #4755 failed to apply on top of branch "release-4.7":

Applying: vendor: bump openshift/api to latest
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_console.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml
M	vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_network.crd.yaml
M	vendor/github.com/openshift/api/config/v1/types_feature.go
M	vendor/github.com/openshift/api/config/v1/types_infrastructure.go
M	vendor/github.com/openshift/api/config/v1/types_ingress.go
M	vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
M	vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/operator/v1/0000_12_etcd-operator_01_config.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_50_cluster-authentication-operator_01_config.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01_crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_70_console-operator.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_70_dns-operator_00-custom-resource-definition.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml
M	vendor/github.com/openshift/api/operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml-patch
M	vendor/github.com/openshift/api/operator/v1/types_console.go
M	vendor/github.com/openshift/api/operator/v1/types_csi_cluster_driver.go
M	vendor/github.com/openshift/api/operator/v1/types_ingress.go
M	vendor/github.com/openshift/api/operator/v1/types_network.go
M	vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go
M	vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/route/v1/types.go
M	vendor/golang.org/x/tools/internal/imports/mod.go
M	vendor/k8s.io/api/admissionregistration/v1/generated.proto
M	vendor/k8s.io/api/admissionregistration/v1beta1/generated.proto
A	vendor/k8s.io/api/apiserverinternal/v1alpha1/generated.pb.go
M	vendor/k8s.io/api/apps/v1/generated.proto
M	vendor/k8s.io/api/apps/v1beta2/generated.proto
M	vendor/k8s.io/api/apps/v1beta2/types.go
M	vendor/k8s.io/api/authentication/v1/generated.proto
M	vendor/k8s.io/api/autoscaling/v1/generated.pb.go
M	vendor/k8s.io/api/autoscaling/v2beta1/generated.pb.go
M	vendor/k8s.io/api/autoscaling/v2beta2/generated.pb.go
M	vendor/k8s.io/api/batch/v1/generated.proto
M	vendor/k8s.io/api/batch/v1/types.go
M	vendor/k8s.io/api/batch/v1/types_swagger_doc_generated.go
M	vendor/k8s.io/api/batch/v1beta1/generated.proto
M	vendor/k8s.io/api/batch/v2alpha1/generated.proto
M	vendor/k8s.io/api/core/v1/generated.pb.go
M	vendor/k8s.io/api/core/v1/generated.proto
M	vendor/k8s.io/api/core/v1/types.go
M	vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go
M	vendor/k8s.io/api/core/v1/well_known_labels.go
M	vendor/k8s.io/api/core/v1/zz_generated.deepcopy.go
M	vendor/k8s.io/api/discovery/v1alpha1/generated.pb.go
M	vendor/k8s.io/api/discovery/v1alpha1/generated.proto
M	vendor/k8s.io/api/discovery/v1alpha1/types.go
M	vendor/k8s.io/api/discovery/v1alpha1/types_swagger_doc_generated.go
M	vendor/k8s.io/api/discovery/v1alpha1/zz_generated.deepcopy.go
M	vendor/k8s.io/api/discovery/v1beta1/generated.pb.go
M	vendor/k8s.io/api/discovery/v1beta1/generated.proto
M	vendor/k8s.io/api/discovery/v1beta1/types.go
M	vendor/k8s.io/api/discovery/v1beta1/types_swagger_doc_generated.go
M	vendor/k8s.io/api/discovery/v1beta1/zz_generated.deepcopy.go
M	vendor/k8s.io/api/events/v1/generated.proto
M	vendor/k8s.io/api/events/v1/types.go
M	vendor/k8s.io/api/events/v1/types_swagger_doc_generated.go
M	vendor/k8s.io/api/events/v1beta1/generated.proto
M	vendor/k8s.io/api/events/v1beta1/types.go
M	vendor/k8s.io/api/events/v1beta1/types_swagger_doc_generated.go
M	vendor/k8s.io/api/extensions/v1beta1/generated.proto
M	vendor/k8s.io/api/extensions/v1beta1/types.go
A	vendor/k8s.io/api/flowcontrol/v1beta1/generated.pb.go
M	vendor/k8s.io/api/networking/v1/generated.proto
M	vendor/k8s.io/api/networking/v1beta1/generated.proto
A	vendor/k8s.io/api/node/v1/generated.pb.go
M	vendor/k8s.io/api/policy/v1beta1/generated.proto
M	vendor/k8s.io/api/storage/v1/generated.pb.go
M	vendor/k8s.io/api/storage/v1/generated.proto
M	vendor/k8s.io/api/storage/v1/types.go
M	vendor/k8s.io/api/storage/v1/types_swagger_doc_generated.go
M	vendor/k8s.io/api/storage/v1alpha1/generated.proto
M	vendor/k8s.io/api/storage/v1beta1/generated.pb.go
M	vendor/k8s.io/api/storage/v1beta1/generated.proto
M	vendor/k8s.io/api/storage/v1beta1/types.go
M	vendor/k8s.io/api/storage/v1beta1/types_swagger_doc_generated.go
M	vendor/k8s.io/api/storage/v1beta1/zz_generated.deepcopy.go
M	vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/generated.proto
M	vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto
M	vendor/k8s.io/apimachinery/pkg/api/meta/conditions.go
M	vendor/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS
M	vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
M	vendor/k8s.io/apimachinery/pkg/apis/meta/v1/types.go
M	vendor/k8s.io/apimachinery/pkg/labels/labels.go
M	vendor/k8s.io/apimachinery/pkg/labels/selector.go
M	vendor/k8s.io/apimachinery/pkg/runtime/scheme.go
M	vendor/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go
M	vendor/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/protobuf.go
M	vendor/k8s.io/apimachinery/pkg/util/clock/clock.go
M	vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy/connection.go
M	vendor/k8s.io/apimachinery/pkg/util/net/http.go
M	vendor/k8s.io/apimachinery/pkg/util/validation/field/path.go
M	vendor/k8s.io/apimachinery/pkg/util/yaml/decoder.go
M	vendor/k8s.io/apimachinery/pkg/watch/mux.go
M	vendor/k8s.io/apimachinery/pkg/watch/streamwatcher.go
M	vendor/k8s.io/cli-runtime/pkg/resource/builder.go
M	vendor/k8s.io/client-go/kubernetes/clientset.go
M	vendor/k8s.io/client-go/kubernetes/scheme/register.go
A	vendor/k8s.io/client-go/kubernetes/typed/apiserverinternal/v1alpha1/storageversion.go
A	vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/flowschema.go
A	vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/prioritylevelconfiguration.go
A	vendor/k8s.io/client-go/kubernetes/typed/node/v1/runtimeclass.go
M	vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go
M	vendor/k8s.io/client-go/rest/request.go
M	vendor/k8s.io/client-go/tools/cache/OWNERS
M	vendor/k8s.io/client-go/tools/cache/delta_fifo.go
M	vendor/k8s.io/client-go/tools/clientcmd/client_config.go
M	vendor/k8s.io/client-go/tools/clientcmd/config.go
M	vendor/k8s.io/client-go/tools/clientcmd/loader.go
M	vendor/k8s.io/client-go/tools/leaderelection/resourcelock/interface.go
M	vendor/k8s.io/client-go/tools/record/event.go
M	vendor/k8s.io/client-go/transport/round_trippers.go
A	vendor/k8s.io/component-base/config/types.go
M	vendor/k8s.io/kubectl/pkg/cmd/util/helpers.go
M	vendor/k8s.io/kubectl/pkg/describe/describe.go
M	vendor/k8s.io/kubectl/pkg/scheme/install.go
M	vendor/modules.txt
M	vendor/sigs.k8s.io/controller-runtime/go.mod
M	vendor/sigs.k8s.io/controller-runtime/go.sum
M	vendor/sigs.k8s.io/controller-runtime/pkg/builder/controller.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/cache_reader.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/informers_map.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/client/interfaces.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/client/patch.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/client/split.go
A	vendor/sigs.k8s.io/controller-runtime/pkg/config/v1alpha1/types.go
A	vendor/sigs.k8s.io/controller-runtime/pkg/config/v1alpha1/zz_generated.deepcopy.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/controller/controller.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/controller/controllerutil/controllerutil.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/handler/enqueue.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/handler/enqueue_mapped.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/handler/enqueue_owner.go.git/rebase-apply/patch:5739: space before tab in indent.
  	// process token
.git/rebase-apply/patch:181666: trailing whitespace.
  
.git/rebase-apply/patch:192415: trailing whitespace.
In this directory, fetch the openapi schema and generate the 
.git/rebase-apply/patch:192416: trailing whitespace.
corresponding swagger.go for the kubernetes api: 
.git/rebase-apply/patch:192442: trailing whitespace.
swagger.json and swagger.go files there. 
warning: squelched 4 whitespace errors
warning: 9 lines add whitespace errors.

M	vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/internal/recorder/recorder.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/log/log.go
A	vendor/sigs.k8s.io/controller-runtime/pkg/manager/client_builder.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/manager/manager.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/predicate/predicate.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/source/source.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/http.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/response.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/webhook.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/webhook/internal/certwatcher/certwatcher.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/webhook/server.go
Falling back to patching base and 3-way merge...
Removing vendor/sigs.k8s.io/kustomize/pkg/types/var.go
Removing vendor/sigs.k8s.io/kustomize/pkg/types/kustomization.go
Removing vendor/sigs.k8s.io/kustomize/pkg/types/genargs.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/transformer.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/refvars.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/prefixsuffixname.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/nooptransformer.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/namespace.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/namereference.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/mutatefield.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/multitransformer.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/labelsandannotations.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/image.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/config/transformerconfig.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/config/fieldspec.go
Removing vendor/sigs.k8s.io/kustomize/pkg/transformers/config/factory.go
Removing vendor/sigs.k8s.io/kustomize/pkg/target/resaccumulator.go
Removing vendor/sigs.k8s.io/kustomize/pkg/target/kusttarget.go
Removing vendor/sigs.k8s.io/kustomize/pkg/resource/resource.go
Removing vendor/sigs.k8s.io/kustomize/pkg/resource/factory.go
Removing vendor/sigs.k8s.io/kustomize/pkg/resmap/resmap.go
Removing vendor/sigs.k8s.io/kustomize/pkg/resmap/factory.go
Removing vendor/sigs.k8s.io/kustomize/pkg/resid/resid.go
Removing vendor/sigs.k8s.io/kustomize/pkg/patch/transformer/patchjson6902json.go
Removing vendor/sigs.k8s.io/kustomize/pkg/patch/transformer/factory.go
Removing vendor/sigs.k8s.io/kustomize/pkg/patch/strategicmerge.go
Removing vendor/sigs.k8s.io/kustomize/pkg/patch/json6902.go
Removing vendor/sigs.k8s.io/kustomize/pkg/loader/loader.go
Removing vendor/sigs.k8s.io/kustomize/pkg/internal/error/secreterror.go
Removing vendor/sigs.k8s.io/kustomize/pkg/internal/error/resourceerror.go
Removing vendor/sigs.k8s.io/kustomize/pkg/internal/error/patcherror.go
Removing vendor/sigs.k8s.io/kustomize/pkg/internal/error/kustomizationerror.go
Removing vendor/sigs.k8s.io/kustomize/pkg/internal/error/configmaperror.go
Removing vendor/sigs.k8s.io/kustomize/pkg/image/image.go
Removing vendor/sigs.k8s.io/kustomize/pkg/image/deprecatedimage.go
Removing vendor/sigs.k8s.io/kustomize/pkg/ifc/transformer/factory.go
Removing vendor/sigs.k8s.io/kustomize/pkg/ifc/ifc.go
Removing vendor/sigs.k8s.io/kustomize/pkg/git/cloner.go
Removing vendor/sigs.k8s.io/kustomize/pkg/fs/realfile.go
Removing vendor/sigs.k8s.io/kustomize/pkg/fs/fs.go
Removing vendor/sigs.k8s.io/kustomize/pkg/fs/fakefs.go
Removing vendor/sigs.k8s.io/kustomize/pkg/fs/fakefileinfo.go
Removing vendor/sigs.k8s.io/kustomize/pkg/fs/fakefile.go
Removing vendor/sigs.k8s.io/kustomize/pkg/factory/factory.go
Removing vendor/sigs.k8s.io/kustomize/pkg/expansion/expand.go
Removing vendor/sigs.k8s.io/kustomize/pkg/constants/constants.go
Removing vendor/sigs.k8s.io/kustomize/pkg/commands/build/build.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/webhook/server.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/webhook.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/response.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/response.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/http.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/http.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/source/source.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/source/source.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/predicate/predicate.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/manager/manager.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/manager/manager.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/log/log.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/internal/recorder/recorder.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/internal/recorder/recorder.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/handler/enqueue_owner.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/handler/enqueue_owner.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/handler/enqueue_mapped.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/handler/enqueue_mapped.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/handler/enqueue.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/handler/enqueue.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/controller/controllerutil/controllerutil.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/controller/controllerutil/controllerutil.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/controller/controller.go
CONFLICT (modify/delete): vendor/sigs.k8s.io/controller-runtime/pkg/config/v1alpha1/zz_generated.deepcopy.go deleted in HEAD and modified in vendor: bump openshift/api to latest. Version vendor: bump openshift/api to latest of vendor/sigs.k8s.io/controller-runtime/pkg/config/v1alpha1/zz_generated.deepcopy.go left in tree.
CONFLICT (modify/delete): vendor/sigs.k8s.io/controller-runtime/pkg/config/v1alpha1/types.go deleted in HEAD and modified in vendor: bump openshift/api to latest. Version vendor: bump openshift/api to latest of vendor/sigs.k8s.io/controller-runtime/pkg/config/v1alpha1/types.go left in tree.
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/client/split.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/client/split.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/client/patch.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/client/interfaces.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/certwatcher/certwatcher.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/informers_map.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/informers_map.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/cache_reader.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/cache_reader.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/builder/controller.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/builder/controller.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/go.sum
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/go.sum
Auto-merging vendor/sigs.k8s.io/controller-runtime/go.mod
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/go.mod
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/k8s.io/kubectl/pkg/scheme/install.go
Auto-merging vendor/k8s.io/kubectl/pkg/describe/describe.go
Auto-merging vendor/k8s.io/kubectl/pkg/cmd/util/helpers.go
Auto-merging vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiservice.go
CONFLICT (content): Merge conflict in vendor/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1beta1/apiservice.go
Auto-merging vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/generated.pb.go
CONFLICT (content): Merge conflict in vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/generated.pb.go
Removing vendor/k8s.io/component-base/version/def.bzl
CONFLICT (modify/delete): vendor/k8s.io/component-base/config/types.go deleted in HEAD and modified in vendor: bump openshift/api to latest. Version vendor: bump openshift/api to latest of vendor/k8s.io/component-base/config/types.go left in tree.
Auto-merging vendor/k8s.io/client-go/transport/round_trippers.go
Auto-merging vendor/k8s.io/client-go/tools/record/event.go
Auto-merging vendor/k8s.io/client-go/tools/leaderelection/resourcelock/interface.go
CONFLICT (content): Merge conflict in vendor/k8s.io/client-go/tools/leaderelection/resourcelock/interface.go
Auto-merging vendor/k8s.io/client-go/tools/clientcmd/loader.go
Auto-merging vendor/k8s.io/client-go/tools/clientcmd/config.go
Auto-merging vendor/k8s.io/client-go/tools/clientcmd/client_config.go
Auto-merging vendor/k8s.io/client-go/tools/cache/delta_fifo.go
Auto-merging vendor/k8s.io/client-go/tools/cache/OWNERS
Auto-merging vendor/k8s.io/client-go/rest/request.go
Auto-merging vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/exec.go
Removing vendor/k8s.io/client-go/pkg/version/def.bzl
CONFLICT (modify/delete): vendor/k8s.io/client-go/kubernetes/typed/node/v1/runtimeclass.go deleted in HEAD and modified in vendor: bump openshift/api to latest. Version vendor: bump openshift/api to latest of vendor/k8s.io/client-go/kubernetes/typed/node/v1/runtimeclass.go left in tree.
CONFLICT (modify/delete): vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/prioritylevelconfiguration.go deleted in HEAD and modified in vendor: bump openshift/api to latest. Version vendor: bump openshift/api to latest of vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1/prioritylevelconfiguration.go left in tree.
CONFLICT (modify/delete): vendor/k8s.io/client-go/kubernetes/typed/apiserverinternal/v1alpha1/storageversion.go deleted in HEAD and modified in vendor: bump openshift/api to latest. Version vendor: bump openshift/api to latest of vendor/k8s.io/client-go/kubernetes/typed/apiserverinternal/v1alpha1/storageversion.go left in tree.
Auto-merging vendor/k8s.io/client-go/kubernetes/scheme/register.go
Auto-merging vendor/k8s.io/client-go/kubernetes/clientset.go
Auto-merging vendor/k8s.io/cli-runtime/pkg/resource/builder.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/validator/validators.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/transformer/patch/patchconflictdetector.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/transformer/patch/patch.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/transformer/hash/namehash.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/transformer/hash/hash.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/transformer/factory.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/kunstruct/kunstruct.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/kunstruct/helper.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/kunstruct/factory.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/factory.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/doc.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/configmapandsecret/secretfactory.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/configmapandsecret/kv.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/k8sdeps/configmapandsecret/configmapfactory.go
Removing vendor/k8s.io/cli-runtime/pkg/kustomize/builder.go
Auto-merging vendor/k8s.io/apimachinery/pkg/watch/streamwatcher.go
Auto-merging vendor/k8s.io/apimachinery/pkg/watch/mux.go
Auto-merging vendor/k8s.io/apimachinery/pkg/util/yaml/decoder.go
CONFLICT (content): Merge conflict in vendor/k8s.io/apimachinery/pkg/util/yaml/decoder.go
Auto-merging vendor/k8s.io/apimachinery/pkg/util/validation/field/path.go
Auto-merging vendor/k8s.io/apimachinery/pkg/util/net/http.go
Auto-merging vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy/connection.go
Auto-merging vendor/k8s.io/apimachinery/pkg/util/clock/clock.go
Auto-merging vendor/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/protobuf.go
Auto-merging vendor/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go
Auto-merging vendor/k8s.io/apimachinery/pkg/runtime/scheme.go
Auto-merging vendor/k8s.io/apimachinery/pkg/labels/selector.go
Auto-merging vendor/k8s.io/apimachinery/pkg/labels/labels.go
Auto-merging vendor/k8s.io/apimachinery/pkg/apis/meta/v1/types.go
Auto-merging vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
Auto-merging vendor/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS
Auto-merging vendor/k8s.io/apimachinery/pkg/api/meta/conditions.go
Auto-merging vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto
Auto-merging vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/generated.proto
Auto-merging vendor/k8s.io/api/storage/v1beta1/zz_generated.deepcopy.go
Auto-merging vendor/k8s.io/api/storage/v1beta1/types_swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/storage/v1beta1/types_swagger_doc_generated.go
Auto-merging vendor/k8s.io/api/storage/v1beta1/types.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/storage/v1beta1/types.go
Auto-merging vendor/k8s.io/api/storage/v1beta1/generated.proto
CONFLICT (content): Merge conflict in vendor/k8s.io/api/storage/v1beta1/generated.proto
Auto-merging vendor/k8s.io/api/storage/v1beta1/generated.pb.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/storage/v1beta1/generated.pb.go
Auto-merging vendor/k8s.io/api/storage/v1alpha1/generated.proto
Auto-merging vendor/k8s.io/api/storage/v1/types_swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/storage/v1/types_swagger_doc_generated.go
Auto-merging vendor/k8s.io/api/storage/v1/types.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/storage/v1/types.go
Auto-merging vendor/k8s.io/api/storage/v1/generated.proto
CONFLICT (content): Merge conflict in vendor/k8s.io/api/storage/v1/generated.proto
Auto-merging vendor/k8s.io/api/storage/v1/generated.pb.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/storage/v1/generated.pb.go
Auto-merging vendor/k8s.io/api/policy/v1beta1/generated.proto
CONFLICT (modify/delete): vendor/k8s.io/api/node/v1/generated.pb.go deleted in HEAD and modified in vendor: bump openshift/api to latest. Version vendor: bump openshift/api to latest of vendor/k8s.io/api/node/v1/generated.pb.go left in tree.
Auto-merging vendor/k8s.io/api/networking/v1beta1/generated.proto
Auto-merging vendor/k8s.io/api/networking/v1/generated.proto
CONFLICT (modify/delete): vendor/k8s.io/api/flowcontrol/v1beta1/generated.pb.go deleted in HEAD and modified in vendor: bump openshift/api to latest. Version vendor: bump openshift/api to latest of vendor/k8s.io/api/flowcontrol/v1beta1/generated.pb.go left in tree.
Auto-merging vendor/k8s.io/api/extensions/v1beta1/types.go
Auto-merging vendor/k8s.io/api/extensions/v1beta1/generated.proto
Auto-merging vendor/k8s.io/api/events/v1beta1/types_swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/events/v1beta1/types_swagger_doc_generated.go
Auto-merging vendor/k8s.io/api/events/v1beta1/types.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/events/v1beta1/types.go
Auto-merging vendor/k8s.io/api/events/v1beta1/generated.proto
CONFLICT (content): Merge conflict in vendor/k8s.io/api/events/v1beta1/generated.proto
Auto-merging vendor/k8s.io/api/events/v1/types_swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/events/v1/types_swagger_doc_generated.go
Auto-merging vendor/k8s.io/api/events/v1/types.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/events/v1/types.go
Auto-merging vendor/k8s.io/api/events/v1/generated.proto
CONFLICT (content): Merge conflict in vendor/k8s.io/api/events/v1/generated.proto
Auto-merging vendor/k8s.io/api/discovery/v1beta1/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/discovery/v1beta1/zz_generated.deepcopy.go
Auto-merging vendor/k8s.io/api/discovery/v1beta1/types_swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/discovery/v1beta1/types_swagger_doc_generated.go
Auto-merging vendor/k8s.io/api/discovery/v1beta1/types.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/discovery/v1beta1/types.go
Auto-merging vendor/k8s.io/api/discovery/v1beta1/generated.proto
CONFLICT (content): Merge conflict in vendor/k8s.io/api/discovery/v1beta1/generated.proto
Auto-merging vendor/k8s.io/api/discovery/v1beta1/generated.pb.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/discovery/v1beta1/generated.pb.go
Auto-merging vendor/k8s.io/api/discovery/v1/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/discovery/v1/zz_generated.deepcopy.go
Auto-merging vendor/k8s.io/api/discovery/v1/types_swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/discovery/v1/types_swagger_doc_generated.go
Auto-merging vendor/k8s.io/api/discovery/v1/types.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/discovery/v1/types.go
Auto-merging vendor/k8s.io/api/discovery/v1/generated.proto
CONFLICT (content): Merge conflict in vendor/k8s.io/api/discovery/v1/generated.proto
Auto-merging vendor/k8s.io/api/discovery/v1/generated.pb.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/discovery/v1/generated.pb.go
Auto-merging vendor/k8s.io/api/core/v1/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/core/v1/zz_generated.deepcopy.go
Auto-merging vendor/k8s.io/api/core/v1/well_known_labels.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/core/v1/well_known_labels.go
Auto-merging vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go
Auto-merging vendor/k8s.io/api/core/v1/types.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/core/v1/types.go
Auto-merging vendor/k8s.io/api/core/v1/generated.proto
CONFLICT (content): Merge conflict in vendor/k8s.io/api/core/v1/generated.proto
Auto-merging vendor/k8s.io/api/core/v1/generated.pb.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/core/v1/generated.pb.go
Removing vendor/k8s.io/api/batch/v2alpha1/zz_generated.deepcopy.go
Removing vendor/k8s.io/api/batch/v2alpha1/types_swagger_doc_generated.go
Removing vendor/k8s.io/api/batch/v2alpha1/types.go
CONFLICT (modify/delete): vendor/k8s.io/api/batch/v2alpha1/generated.proto deleted in vendor: bump openshift/api to latest and modified in HEAD. Version HEAD of vendor/k8s.io/api/batch/v2alpha1/generated.proto left in tree.
Removing vendor/k8s.io/api/batch/v2alpha1/generated.pb.go
Auto-merging vendor/k8s.io/api/batch/v1beta1/generated.proto
Auto-merging vendor/k8s.io/api/batch/v1/types_swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/batch/v1/types_swagger_doc_generated.go
Auto-merging vendor/k8s.io/api/batch/v1/types.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/batch/v1/types.go
Auto-merging vendor/k8s.io/api/batch/v1/generated.proto
CONFLICT (content): Merge conflict in vendor/k8s.io/api/batch/v1/generated.proto
Auto-merging vendor/k8s.io/api/autoscaling/v2beta2/generated.pb.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/autoscaling/v2beta2/generated.pb.go
Auto-merging vendor/k8s.io/api/autoscaling/v2beta1/generated.pb.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/autoscaling/v2beta1/generated.pb.go
Auto-merging vendor/k8s.io/api/autoscaling/v1/generated.pb.go
CONFLICT (content): Merge conflict in vendor/k8s.io/api/autoscaling/v1/generated.pb.go
Auto-merging vendor/k8s.io/api/authentication/v1/generated.proto
Auto-merging vendor/k8s.io/api/apps/v1beta2/types.go
Auto-merging vendor/k8s.io/api/apps/v1beta2/generated.proto
Auto-merging vendor/k8s.io/api/apps/v1/generated.proto
Auto-merging vendor/k8s.io/api/admissionregistration/v1beta1/generated.proto
Auto-merging vendor/k8s.io/api/admissionregistration/v1/generated.proto
Auto-merging vendor/golang.org/x/tools/internal/imports/mod.go
Auto-merging vendor/github.com/openshift/api/route/v1/types.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/route/v1/types.go
Auto-merging vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_network.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/types_network.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_ingress.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_csi_cluster_driver.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/types_csi_cluster_driver.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_console.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/types_console.go
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml-patch
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml-patch
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_70_dns-operator_00-custom-resource-definition.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_70_console-operator.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01_crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01_crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_50_cluster-authentication-operator_01_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/operator/v1/0000_12_etcd-operator_01_config.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_ingress.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/types_ingress.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_infrastructure.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_feature.go
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_network.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_console.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml
Auto-merging vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_operatorhub.crd.yaml
Removing vendor/github.com/docker/spdystream/utils.go
Removing vendor/github.com/docker/spdystream/LICENSE.docs
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 vendor: bump openshift/api to latest
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.7

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 added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 15, 2021

openshift-ci-robot requested review from jhixson74 and jstuever March 15, 2021 21:18

staebler force-pushed the user_tags_in_cluster branch from 1e05276 to 9bd866c Compare March 16, 2021 14:25

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 27, 2021

frobware mentioned this pull request Apr 16, 2021

Bug 1950284: Annotate services of type LoadBalancer with user tags (AWS only) openshift/cluster-ingress-operator#578

Merged

staebler force-pushed the user_tags_in_cluster branch from 9bd866c to 4ab07b8 Compare April 21, 2021 05:17

openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 21, 2021

staebler changed the title ~~manifests: populate aws user tags in infrastructure~~ Bug 1950113: manifests: populate aws user tags in infrastructure Apr 21, 2021

openshift-ci-robot added bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Apr 21, 2021

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 21, 2021

staebler force-pushed the user_tags_in_cluster branch 3 times, most recently from 498aed1 to 48c4bd7 Compare April 21, 2021 05:34

openshift-ci-robot assigned mtnbikenc Apr 22, 2021

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 22, 2021

staebler added 2 commits April 22, 2021 16:43

vendor: bump openshift/api to latest

d54a4cd

Bump github.com/openshift/api to pick up AWS resource tags in the infrastructure.config.openshift.io CRD. * upgrade kubernetes modules to v0.21.0-rc.0 * pin sigs.k8s.io/controller-runtime to v0.9.0-alpha.1

staebler force-pushed the user_tags_in_cluster branch from b6dcb74 to 2033421 Compare April 22, 2021 20:46

openshift-ci-robot assigned patrickdillon Apr 22, 2021

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 22, 2021

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 23, 2021

staebler mentioned this pull request Apr 23, 2021

vendor: bump openshift/api to latest #4839

Closed

openshift-merge-robot merged commit 1897484 into openshift:master Apr 24, 2021

openshift-ci-robot mentioned this pull request Apr 26, 2021

Bug 1950113: vendor: bump to the latest openshift/api openshift/cluster-config-operator#199

Merged

frobware mentioned this pull request Apr 27, 2021

[release-4.7] Bug 1954097: Annotate services of type LoadBalancer with user tags (AWS only) openshift/cluster-ingress-operator#606

Merged

staebler mentioned this pull request Apr 27, 2021

Bug 1954152: manifests: populate aws user tags in infrastructure #4882

Merged

wking mentioned this pull request May 8, 2021

Bug 1958420: aws: restore setting aws platform spec in infra resource #4916

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1950113: manifests: populate aws user tags in infrastructure #4755

Bug 1950113: manifests: populate aws user tags in infrastructure #4755

staebler commented Mar 15, 2021 •

edited

Loading

staebler commented Mar 15, 2021

staebler commented Mar 16, 2021

openshift-ci-robot commented Mar 27, 2021

gregsheremeta commented Apr 20, 2021

openshift-ci-robot commented Apr 21, 2021

staebler commented Apr 21, 2021

mtnbikenc commented Apr 21, 2021

gregsheremeta commented Apr 21, 2021

frobware commented Apr 22, 2021

frobware commented Apr 22, 2021

mtnbikenc commented Apr 22, 2021

staebler commented Apr 22, 2021

openshift-ci-robot commented Apr 22, 2021

patrickdillon commented Apr 22, 2021

patrickdillon commented Apr 22, 2021

staebler commented Apr 23, 2021

openshift-bot commented Apr 23, 2021

openshift-bot commented Apr 23, 2021

openshift-bot commented Apr 23, 2021

openshift-bot commented Apr 23, 2021

openshift-bot commented Apr 23, 2021

staebler commented Apr 23, 2021

openshift-bot commented Apr 24, 2021

openshift-bot commented Apr 24, 2021

openshift-bot commented Apr 24, 2021

openshift-bot commented Apr 24, 2021

openshift-ci bot commented Apr 24, 2021

openshift-bot commented Apr 24, 2021

openshift-ci-robot commented Apr 24, 2021

staebler commented Apr 27, 2021

openshift-cherrypick-robot commented Apr 27, 2021

Bug 1950113: manifests: populate aws user tags in infrastructure #4755

Bug 1950113: manifests: populate aws user tags in infrastructure #4755

Conversation

staebler commented Mar 15, 2021 • edited Loading

staebler commented Mar 15, 2021

staebler commented Mar 16, 2021

openshift-ci-robot commented Mar 27, 2021

gregsheremeta commented Apr 20, 2021

openshift-ci-robot commented Apr 21, 2021

staebler commented Apr 21, 2021

mtnbikenc commented Apr 21, 2021

gregsheremeta commented Apr 21, 2021

frobware commented Apr 22, 2021

frobware commented Apr 22, 2021

mtnbikenc commented Apr 22, 2021

staebler commented Apr 22, 2021

openshift-ci-robot commented Apr 22, 2021

patrickdillon commented Apr 22, 2021

patrickdillon commented Apr 22, 2021

staebler commented Apr 23, 2021

openshift-bot commented Apr 23, 2021

openshift-bot commented Apr 23, 2021

openshift-bot commented Apr 23, 2021

openshift-bot commented Apr 23, 2021

openshift-bot commented Apr 23, 2021

staebler commented Apr 23, 2021

openshift-bot commented Apr 24, 2021

openshift-bot commented Apr 24, 2021

openshift-bot commented Apr 24, 2021

openshift-bot commented Apr 24, 2021

openshift-ci bot commented Apr 24, 2021

openshift-bot commented Apr 24, 2021

openshift-ci-robot commented Apr 24, 2021

staebler commented Apr 27, 2021

openshift-cherrypick-robot commented Apr 27, 2021

staebler commented Mar 15, 2021 •

edited

Loading