Bug 1948714: IBM Cloud manifest profile patch #643

csrwng · 2020-11-19T00:08:53Z

Part 2 of cluster profiles support for IBM Cloud.
Introduces a directory that will contain profile-specific patches.
Profile-specific manifests are generated with 'make profile-manifests'
and 'hack/verify-profile-manifests.sh' (called by 'make verify') verifies
that the manifests directory is up to date.

On IBM Cloud the Image Registry operator needs to run on worker nodes, thus the
master node selector needs to be removed from the operator deployment
manifest.

csrwng · 2020-11-19T00:13:55Z

/hold
This should only merge when profiles support has been turned on in the CVO

openshift-merge-robot · 2020-11-19T02:29:29Z

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

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-operator	`313dc3f`	link	`/test e2e-aws-operator`

Full PR test history. Your PR dashboard.

Details

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.

dmage · 2020-11-19T09:45:02Z

hack/update-profile-manifests.sh

@@ -0,0 +1,80 @@
+#!/usr/bin/env bash


Is this script specific for this repo of do we have it copied to multiple repos?

Hi @dmage so far the thinking is that it would be copied to multiple repos, given that we don't have a good way of sharing scripts across multiple components. It could be placed in library-go, but not all components use library-go. Also not all components use the same directories for their manifests. I'm definitely open to ideas on how to better handle this.

@csrwng what about https://github.com/openshift/build-machinery-go ? cluster-image-registry-operator uses only one target from build-machinery, so it shouldn't be a problem to add a single target to other repositories.

See

cluster-image-registry-operator/Makefile

Lines 9 to 13 in e5877a8

include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \

targets/openshift/bindata.mk \

)

$(call add-bindata,assets,./bindata/...,./bindata/,assets,pkg/assets/bindata.go)

You can add something similar:

$(call add-profile-manifests,./manifests/,./profile-patches/)

That sounds promising, will try it out. Thx!

Submitted openshift/build-machinery-go#26 - will update this PR when that merges

openshift-bot · 2021-02-18T00:52:12Z

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

csrwng · 2021-02-18T02:07:40Z

/remove-lifecycle stale

csrwng · 2021-03-30T17:34:43Z

@dmage I've now updated this PR to bump to the latest build-machinery-go and I'm now using that add a patch for ibm-cloud-managed.

csrwng · 2021-03-31T14:10:30Z

/retest

dmage · 2021-04-01T11:03:21Z

/assign @ricardomaraschini

ricardomaraschini · 2021-04-06T09:08:00Z

Makefile

 GOLANGCI_LINT_CACHE = $(PWD)/_output/golangci-lint-cache
 GOLANGCI_LINT_VERSION = v1.24

+GO_REQUIRED_MIN_VERSION = 1.14


Is there any special reason for not going with a newer version? I have noticed here that if it is not set we go for 1.15.2.

The reason I added this here, is that verify previously failed (looks like your CI test is using an older go version):
https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-image-registry-operator/643/pull-ci-openshift-cluster-image-registry-operator-master-verify/1376950809396252672
Note that this is the minimum version. It's fine to use a newer release.

ricardomaraschini · 2021-04-06T09:10:24Z

manifests/07-operator-ibm-cloud-managed.yaml

@@ -0,0 +1,86 @@
+apiVersion: apps/v1


Would you mind giving me some explanation on how this is going to work? I mean, with this extra manifest here isn't CVO going to create two distinct deployments (07-operator.yaml and 07-operator-ibm-cloud-managed.yaml)? Is there some special handling happening @ cvo side to handle this?

Basically for any given installation of openshift only one cluster profile is active. The CVO will only apply manifests that contain an annotation for the active cluster profile.
Ref: openshift/cluster-version-operator#404
Enhancement: openshift/enhancements#200

ricardomaraschini · 2021-04-06T09:13:54Z

vendor/github.com/openshift/build-machinery-go/make/lib/doc.go

@@ -0,0 +1,3 @@
+// required for gomod to pull in packages.


Could you split this PR into two separated commits? One with vendoring stuff and the other with the changes.

@ricardomaraschini it is in 2 separate commits

csrwng · 2021-04-06T13:57:55Z

/retest

ricardomaraschini

/lgtm

openshift-ci-robot · 2021-04-09T14:25:59Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng, ricardomaraschini

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [ricardomaraschini]

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

ricardomaraschini · 2021-04-09T14:26:25Z

/hold

ricardomaraschini · 2021-04-09T14:43:14Z

/retest

dmage · 2021-04-09T14:58:09Z

/hold cancel

dmage · 2021-04-12T12:52:26Z

/retest

openshift-ci-robot · 2021-04-12T19:31:45Z

@csrwng: This pull request references Bugzilla bug 1948714, which is valid. The bug has been moved to the POST state. 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 NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @csrwng

Details

In response to this:

Bug 1948714: IBM Cloud manifest profile patch

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 · 2021-04-12T19:31:47Z

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: csrwng.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

@csrwng: This pull request references Bugzilla bug 1948714, which is valid. The bug has been moved to the POST state. 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 NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @csrwng

In response to this:

Bug 1948714: IBM Cloud manifest profile patch

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.

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.

csrwng · 2021-04-12T19:32:28Z

/bugzilla refresh

openshift-ci-robot · 2021-04-12T19:32:32Z

@csrwng: This pull request references Bugzilla bug 1948714, which is valid.

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)

Requesting review from QA contact:
/cc @csrwng

Details

In response to this:

/bugzilla refresh

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 · 2021-04-12T19:32:33Z

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: csrwng.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

@csrwng: This pull request references Bugzilla bug 1948714, which is valid.

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)

Requesting review from QA contact:
/cc @csrwng

In response to this:

/bugzilla refresh

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.

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.

csrwng · 2021-04-15T02:22:27Z

/retest

openshift-ci-robot · 2021-04-15T04:22:40Z

@csrwng: All pull requests linked via external trackers have merged:

openshift/cluster-image-registry-operator#643

Bugzilla bug 1948714 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1948714: IBM Cloud manifest profile patch

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 requested review from dmage and ricardomaraschini November 19, 2020 00:09

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 19, 2020

dmage reviewed Nov 19, 2020

View reviewed changes

simonpasquier mentioned this pull request Jan 15, 2021

Add HighAvailabilityMode field to 'infrastructure' CRD openshift/api#827

Merged

openshift-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Feb 18, 2021

openshift-ci-robot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Feb 18, 2021

csrwng force-pushed the roks_profile_patches branch from 313dc3f to fbefa25 Compare March 30, 2021 17:29

Bump github.com/openshift/build-machinery-go

abe0878

csrwng force-pushed the roks_profile_patches branch from fbefa25 to 2f588b0 Compare March 30, 2021 17:33

Add manifest patch for IBM public cloud managed

30c347e

csrwng force-pushed the roks_profile_patches branch from 2f588b0 to 30c347e Compare March 30, 2021 18:50

openshift-ci-robot assigned ricardomaraschini Apr 1, 2021

ricardomaraschini reviewed Apr 6, 2021

View reviewed changes

ricardomaraschini approved these changes Apr 9, 2021

View reviewed changes

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

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 9, 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 9, 2021

csrwng changed the title ~~IBM Cloud manifest profile patch~~ Bug 1948714: IBM Cloud manifest profile patch Apr 12, 2021

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

openshift-ci-robot removed the bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. label Apr 12, 2021

openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Apr 12, 2021

openshift-merge-robot merged commit 97fbfd7 into openshift:master Apr 15, 2021

	include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
	targets/openshift/bindata.mk \
	)

	$(call add-bindata,assets,./bindata/...,./bindata/,assets,pkg/assets/bindata.go)

Bug 1948714: IBM Cloud manifest profile patch #643

Bug 1948714: IBM Cloud manifest profile patch #643

Uh oh!

Conversation

csrwng commented Nov 19, 2020

Uh oh!

csrwng commented Nov 19, 2020

Uh oh!

openshift-merge-robot commented Nov 19, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

openshift-bot commented Feb 18, 2021

Uh oh!

csrwng commented Feb 18, 2021

Uh oh!

csrwng commented Mar 30, 2021

Uh oh!

csrwng commented Mar 31, 2021

Uh oh!

dmage commented Apr 1, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

csrwng commented Apr 6, 2021

Uh oh!

ricardomaraschini left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Apr 9, 2021

Uh oh!

ricardomaraschini commented Apr 9, 2021

Uh oh!

ricardomaraschini commented Apr 9, 2021

Uh oh!

dmage commented Apr 9, 2021

Uh oh!

dmage commented Apr 12, 2021

Uh oh!

openshift-ci-robot commented Apr 12, 2021

Uh oh!

openshift-ci-robot commented Apr 12, 2021

Uh oh!

csrwng commented Apr 12, 2021

Uh oh!

openshift-ci-robot commented Apr 12, 2021

Uh oh!

openshift-ci-robot commented Apr 12, 2021

Uh oh!

csrwng commented Apr 15, 2021

Uh oh!

openshift-ci-robot commented Apr 15, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants