Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1871858: update make generate #159

Conversation

michaelgugino
Copy link

@michaelgugino michaelgugino commented Aug 14, 2020

This commit updates Make generate target to make it
uniform with other providers. Current Make generate
does not work correctly.

This commit removes obselete hack script for generating.

@kwoodson
Copy link

@alexander-demichev @elmiko
Could we get this one looked at so that I get update my BYOK encryption PR (#158 ) updated?

Copy link

@elmiko elmiko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think this change worked, but there is an issue with using the non-containerized workflow.

also, imo we should have a description of why this change is being added.

./hack/update-generated-deep-copies.sh
generate:
$(DOCKER_CMD) go generate ./pkg/... ./cmd/...
hack/goimports.sh .
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when i run this target in no docker mode, make will fail because the git diff returns a non zero value. i think we need to adjust how this gets returned when not using containerized builds.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elmiko
Docker mode is source of truth, that's what gets run in CI. The output of go's tooling can change from version to version. It's a mess, so best practice is to use the docker containers for reproducible stuff.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it. i feel like we should just remove the non-container builds if we aren't going to maintain the "NO_DOCKER" option.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need the "NO_DOCKER" option because the CI uses it. The jobs are already running in the container, so we pass them NO_DOCKER, so we can't get rid of it. Having Docker in the Makefile is for us to run it locally in the same environment as the CI.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah it makes sense, i totally get why we use docker builds for stuff. i'd just like to see these makefiles become more bulletproof for developers. i find the callout to docker specifically annoying because i don't have it, or an alias, on many machines since it's been removed from more recent fedora versions.

and this is not an issue for this PR, i'm just griping more in general now because it seems like some of these makefiles breakdown when you try to run them locally, and i find it to be a pain for devel stuff.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we we have to run goimports after doing the code generation? That could maybe use a comment as I don't think it's obvious

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JoelSpeed I don't know. This is just copying what we're doing on AWS. openshift/cluster-api-provider-aws#258

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack, and there's no explanation of why that is on the AWS side either 😞

@elmiko
Copy link

elmiko commented Aug 18, 2020

i'm fine to approve this, @michaelgugino would you mind adding a description to the commit message so we know why this change happened?
/approve

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elmiko

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:

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 18, 2020
This commit updates Make generate target to make it
uniform with other providers.  Current Make generate
does not work correctly.

This commit removes obselete hack script for generating.
@elmiko
Copy link

elmiko commented Aug 19, 2020

i tested this out locally with a symlink from docker to podman, everything seemed to work as expected.
(i know i gave the approve, but i'm adding lgtm here to help move things along)
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 19, 2020
@openshift-bot
Copy link

/retest

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

@kwoodson
Copy link

@alexander-demichev @elmiko
What's the next step with merging this?

@elmiko
Copy link

elmiko commented Aug 20, 2020

@alexander-demichev @elmiko
What's the next step with merging this?

it looks like we might need to create a bugzilla at this point given where we are in the release cycle, or if there is a bz already we just need to adjust the title slightly.

@michaelgugino michaelgugino changed the title update make generate Bug 1871858: update make generate Aug 24, 2020
@openshift-ci-robot openshift-ci-robot added bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Aug 24, 2020
@openshift-ci-robot
Copy link

@michaelgugino: This pull request references Bugzilla bug 1871858, which is invalid:

  • expected the bug to target the "4.6.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1871858: update make generate

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.

Copy link

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

(So we have two independent people approving it)

./hack/update-generated-deep-copies.sh
generate:
$(DOCKER_CMD) go generate ./pkg/... ./cmd/...
hack/goimports.sh .

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack, and there's no explanation of why that is on the AWS side either 😞

@michaelgugino
Copy link
Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-low Referenced Bugzilla bug's severity is low 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. and removed bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Aug 24, 2020
@openshift-ci-robot
Copy link

@michaelgugino: This pull request references Bugzilla bug 1871858, 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.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

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-bot
Copy link

/retest

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

23 similar comments
@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@openshift-bot
Copy link

/retest

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

@kwoodson
Copy link

/test e2e-azure-operator

@kwoodson
Copy link

Seems as though this failure is unrelated to this PR. Looks like the scale down and cleanup timed out after 360s.

[Fail] [Feature:Machines] Autoscaler should use a ClusterAutoscaler that has 100 maximum total nodes count [AfterEach] cleanup deletion information after scale down [Slow] 
10573
/go/src/github.com/openshift/cluster-api-actuator-pkg/pkg/autoscaler/autoscaler.go:303
10574
10575
Ran 2 of 34 Specs in 2575.868 seconds
10576
FAIL! -- 1 Passed | 1 Failed | 0 Pending | 32 Skipped
10577
--- FAIL: TestE2E (2575.87s)
10578
FAIL

@openshift-merge-robot openshift-merge-robot merged commit 29efd36 into openshift:master Sep 1, 2020
@openshift-ci-robot
Copy link

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

Bugzilla bug 1871858 has been moved to the MODIFIED state.

In response to this:

Bug 1871858: update make generate

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-cherrypick-robot

@michaelgugino: #159 failed to apply on top of branch "release-4.5":

Applying: UPSTREAM: <carry>: openshift: update make generate
Using index info to reconstruct a base tree...
M	Makefile
A	hack/update-generated-deep-copies.sh
M	pkg/apis/azureprovider/v1beta1/zz_generated.deepcopy.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/apis/azureprovider/v1beta1/zz_generated.deepcopy.go
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 UPSTREAM: <carry>: openshift: update make generate
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:

/cherrypick release-4.5

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-low Referenced Bugzilla bug's severity is low 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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants