OAPE-18: Bump openshift/api to vendor machineNamePrefix field #333

chiragkyal · 2024-12-02T10:50:09Z

Bump openshift/api to vendor machineNamePrefix field and CPMSMachineNamePrefix feature-gate

Part of : OAPE-18
Implementes : OAPE-25: Customizing control plane machine names enhancements#1714
API PR: CFE-1167: Feature-gated MachineNamePrefix field for CPMS api#2086

go get github.com/openshift/api@43830fe27fdad91d7af6ee0da62010507817b3d8 go mod tidy && go mod vendor Signed-off-by: chiragkyal <[email protected]>

openshift-ci-robot · 2024-12-02T10:50:14Z

@chiragkyal: This pull request references OAPE-18 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Bump openshift/api to vendor machineNamePrefix field and CPMSMachineNamePrefix feature-gate

Part of : OAPE-18

Implementes : OAPE-25: Customizing control plane machine names enhancements#1714

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.

damdo · 2024-12-02T17:14:46Z

The failure in units look legit @chiragkyal

chiragkyal · 2024-12-02T17:18:55Z

The failure in units look legit @chiragkyal

Yeah, it's due to the format library for CEL validation. I asked @JoelSpeed about this in Slack. Let me update the ENVTEST_K8S_VERSION

chiragkyal · 2024-12-02T18:28:12Z

https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-control-plane-machine-set-operator/333/pull-ci-openshift-cluster-control-plane-machine-set-operator-main-unit/1863634503809896448#1:build-log.txt%3A26

unable to fetch hash for requested version: unable to find archive for 1.31.2 (linux,amd64)
exit status 2
KUBEBUILDER_ASSETS="" ./hack/test.sh

Looks like 1.31.2 binaries are not available in upstream yet.

go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
go: downloading sigs.k8s.io/controller-runtime v0.19.3
----
setup-envtest use
Version: 1.31.0

damdo · 2024-12-03T10:20:44Z

Yeah, let's use 1.31.0 then.
Thanks

chiragkyal · 2024-12-03T10:49:10Z

Makefile

@@ -91,7 +91,7 @@ test: generate fmt vet unit ## Run tests.

 .PHONY: unit
 unit: ## Run only the tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(PROJECT_DIR)/bin)" ./hack/test.sh
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(PROJECT_DIR)/bin --index https://raw.githubusercontent.com/openshift/api/master/envtest-releases.yaml)" ./hack/test.sh


We can change the index reference to this repository in a follow up PR

No, it should stay pointing at o/api please, keeping that as a central openshift source of truth

Sure, thanks for the suggestion.

chiragkyal · 2024-12-03T11:27:33Z

Looks like I'm hitting an issue related to openshift/api#2074 PR.

              Status: "Failure",
              Message: "admission webhook \"controlplanemachineset.machine.openshift.io\" denied the request: spec.template.machines_v1beta1_machine_openshift_io.spec.providerSpec.value.workspace: Internal error: workspace fields should not be set when control plane nodes are in a failure domain: &v1beta1.Workspace{Server:\"test-vcenter\", Datacenter:\"\", Folder:\"\", Datastore:\"\", ResourcePool:\"\", VMGroup:\"\"}",
              Reason: "Forbidden",
              Details: nil,
              Code: 403,
          },
      }
  to match error
      <*matchers.AndMatcher | 0xc000ab4fc0>: {
          Matchers: [
              <*matchers.EqualMatcher | 0xc0009004a0>{
                  Expected: <string>"admission webhook \"controlplanemachineset.machine.openshift.io\" denied the request: spec.template.machines_v1beta1_machine_openshift_io.spec.providerSpec.value.workspace: Internal error: workspace fields should not be set when control plane nodes are in a failure domain: &v1beta1.Workspace{Server:\"test-vcenter\", Datacenter:\"\", Folder:\"\", Datastore:\"\", ResourcePool:\"\"}",
              },
          ],

@jcpowermac Could you please help fix the issue?

JoelSpeed · 2024-12-03T11:51:56Z

envtest-releases.yaml

Index should only live in the o/api repo, please don't commit this here

Sure sounds good, I've removed the file.

update k8s version of envtest Signed-off-by: chiragkyal <[email protected]>

Signed-off-by: chiragkyal <[email protected]>

chiragkyal · 2024-12-03T12:43:36Z

/jira-refresh

chiragkyal · 2024-12-03T12:44:41Z

/jira refresh

openshift-ci-robot · 2024-12-03T12:44:44Z

@chiragkyal: This pull request references OAPE-18 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

/jira 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 openshift-eng/jira-lifecycle-plugin repository.

chiragkyal · 2024-12-03T12:50:31Z

/test unit

jcpowermac · 2024-12-03T12:50:42Z

Looks like I'm hitting an issue related to openshift/api#2074 PR.

              Status: "Failure",
              Message: "admission webhook \"controlplanemachineset.machine.openshift.io\" denied the request: spec.template.machines_v1beta1_machine_openshift_io.spec.providerSpec.value.workspace: Internal error: workspace fields should not be set when control plane nodes are in a failure domain: &v1beta1.Workspace{Server:\"test-vcenter\", Datacenter:\"\", Folder:\"\", Datastore:\"\", ResourcePool:\"\", VMGroup:\"\"}",
              Reason: "Forbidden",
              Details: nil,
              Code: 403,
          },
      }
  to match error
      <*matchers.AndMatcher | 0xc000ab4fc0>: {
          Matchers: [
              <*matchers.EqualMatcher | 0xc0009004a0>{
                  Expected: <string>"admission webhook \"controlplanemachineset.machine.openshift.io\" denied the request: spec.template.machines_v1beta1_machine_openshift_io.spec.providerSpec.value.workspace: Internal error: workspace fields should not be set when control plane nodes are in a failure domain: &v1beta1.Workspace{Server:\"test-vcenter\", Datacenter:\"\", Folder:\"\", Datastore:\"\", ResourcePool:\"\"}",
              },
          ],

@jcpowermac Could you please help fix the issue?

see #325

chiragkyal · 2024-12-03T12:52:47Z

see #325

Thanks. I hope bec86f9 will make the unit tests happy for now.

chiragkyal · 2024-12-03T18:34:25Z

/retest-required

openshift-ci · 2024-12-03T21:07:43Z

@chiragkyal: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/okd-scos-e2e-aws-ovn	`bec86f9`	link	false	`/test okd-scos-e2e-aws-ovn`
ci/prow/e2e-vsphere-ovn-etcd-scaling	`bec86f9`	link	false	`/test e2e-vsphere-ovn-etcd-scaling`

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

chiragkyal · 2024-12-04T04:50:32Z

/assign @JoelSpeed @damdo
up for approval

damdo

/lgtm

/retest-required

chiragkyal · 2024-12-05T08:54:06Z

@damdo, could you help in approval as well? Thanks!

damdo

/approve

It looks reasonable to me.

openshift-ci · 2024-12-05T09:34:07Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo

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

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

openshift-bot · 2024-12-05T18:53:23Z

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-control-plane-machine-set-operator
This PR has been included in build ose-cluster-control-plane-machine-set-operator-container-v4.19.0-202412051538.p0.g3e1ac98.assembly.stream.el9.
All builds following this will include this PR.

Bump openshift/api to support machineNamePrefix

b0f1293

go get github.com/openshift/api@43830fe27fdad91d7af6ee0da62010507817b3d8 go mod tidy && go mod vendor Signed-off-by: chiragkyal <[email protected]>

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 2, 2024

openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 2, 2024

openshift-ci bot requested review from damdo and RadekManak December 2, 2024 10:50

openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 3, 2024

chiragkyal commented Dec 3, 2024

View reviewed changes

JoelSpeed reviewed Dec 3, 2024

View reviewed changes

chiragkyal added 2 commits December 3, 2024 17:26

kubebuilder assets can refer o/api index file

5e69a65

update k8s version of envtest Signed-off-by: chiragkyal <[email protected]>

fix unit related to VMGroup

bec86f9

Signed-off-by: chiragkyal <[email protected]>

chiragkyal force-pushed the bump-api branch from e701686 to bec86f9 Compare December 3, 2024 11:57

openshift-ci bot assigned damdo and JoelSpeed Dec 4, 2024

damdo reviewed Dec 4, 2024

View reviewed changes

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 4, 2024

damdo reviewed Dec 5, 2024

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 5, 2024

openshift-merge-bot bot merged commit 3e1ac98 into openshift:main Dec 5, 2024
18 of 20 checks passed

chiragkyal deleted the bump-api branch December 5, 2024 10:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OAPE-18: Bump openshift/api to vendor machineNamePrefix field #333

OAPE-18: Bump openshift/api to vendor machineNamePrefix field #333

chiragkyal commented Dec 2, 2024 •

edited

Loading

openshift-ci-robot commented Dec 2, 2024 •

edited by openshift-ci bot

Loading

damdo commented Dec 2, 2024

chiragkyal commented Dec 2, 2024 •

edited

Loading

chiragkyal commented Dec 2, 2024

damdo commented Dec 3, 2024

chiragkyal Dec 3, 2024

JoelSpeed Dec 3, 2024

chiragkyal Dec 3, 2024

chiragkyal commented Dec 3, 2024

JoelSpeed Dec 3, 2024

chiragkyal Dec 3, 2024

chiragkyal commented Dec 3, 2024

chiragkyal commented Dec 3, 2024

openshift-ci-robot commented Dec 3, 2024 •

edited by openshift-ci bot

Loading

chiragkyal commented Dec 3, 2024

jcpowermac commented Dec 3, 2024

chiragkyal commented Dec 3, 2024

chiragkyal commented Dec 3, 2024

openshift-ci bot commented Dec 3, 2024 •

edited

Loading

chiragkyal commented Dec 4, 2024

damdo left a comment

chiragkyal commented Dec 5, 2024

damdo left a comment

openshift-ci bot commented Dec 5, 2024

openshift-bot commented Dec 5, 2024

OAPE-18: Bump openshift/api to vendor machineNamePrefix field #333

OAPE-18: Bump openshift/api to vendor machineNamePrefix field #333

Conversation

chiragkyal commented Dec 2, 2024 • edited Loading

openshift-ci-robot commented Dec 2, 2024 • edited by openshift-ci bot Loading

damdo commented Dec 2, 2024

chiragkyal commented Dec 2, 2024 • edited Loading

chiragkyal commented Dec 2, 2024

damdo commented Dec 3, 2024

chiragkyal Dec 3, 2024

Choose a reason for hiding this comment

JoelSpeed Dec 3, 2024

Choose a reason for hiding this comment

chiragkyal Dec 3, 2024

Choose a reason for hiding this comment

chiragkyal commented Dec 3, 2024

JoelSpeed Dec 3, 2024

Choose a reason for hiding this comment

chiragkyal Dec 3, 2024

Choose a reason for hiding this comment

chiragkyal commented Dec 3, 2024

chiragkyal commented Dec 3, 2024

openshift-ci-robot commented Dec 3, 2024 • edited by openshift-ci bot Loading

chiragkyal commented Dec 3, 2024

jcpowermac commented Dec 3, 2024

chiragkyal commented Dec 3, 2024

chiragkyal commented Dec 3, 2024

openshift-ci bot commented Dec 3, 2024 • edited Loading

chiragkyal commented Dec 4, 2024

damdo left a comment

Choose a reason for hiding this comment

chiragkyal commented Dec 5, 2024

damdo left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Dec 5, 2024

openshift-bot commented Dec 5, 2024

chiragkyal commented Dec 2, 2024 •

edited

Loading

openshift-ci-robot commented Dec 2, 2024 •

edited by openshift-ci bot

Loading

chiragkyal commented Dec 2, 2024 •

edited

Loading

openshift-ci-robot commented Dec 3, 2024 •

edited by openshift-ci bot

Loading

openshift-ci bot commented Dec 3, 2024 •

edited

Loading