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

Update Makefile #151

Closed

Conversation

clobrano
Copy link
Contributor

Why we need this PR

The current Makefile needs update for

  • adding mandatory annotation to OKD bundle
  • update golang version
  • update tools

adding the mandatory annotation, I also noted an issue in CI which I decided to fix here, see the first change in the next section.

Changes made

  • Fix tag version in release document created by CI
  • Bump golang to version 1.22
  • Add OCP annotation to OKD bundle
  • Bump kustomize to version v5.4.2
  • Fix verify-unchanged script log
  • Bump controller-gen and envtest versions
  • Bump ginkgo version to v2.19.0
  • vendoring due to ginkgo version bump
  • Bump goimports, opm and sort-imports versions
  • Bump operator-sdk version to v1.35
  • Bump envtest k8s version to 1.30

Which issue(s) this PR fixes

Test plan

Currently the release document created by CI uses github.ref_name in
place of the release version, but since we are not running this job on
tag creation anymore, this variable has the name of the branch instead
than the tag.

This change replaced {{github.ref_name}} with v{{inputs.version}}, which
contains the proper tag version.

Signed-off-by: Carlo Lobrano <[email protected]>
Signed-off-by: Carlo Lobrano <[email protected]>
Signed-off-by: Carlo Lobrano <[email protected]>
Signed-off-by: Carlo Lobrano <[email protected]>
Copy link
Contributor

openshift-ci bot commented Jul 23, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Copy link
Contributor

openshift-ci bot commented Jul 23, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: clobrano

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

@clobrano clobrano force-pushed the add-mandatory-annotations-to-okd-bundle branch from 933e6a1 to 3e1ab52 Compare July 23, 2024 09:35
@clobrano clobrano force-pushed the add-mandatory-annotations-to-okd-bundle branch from 3e1ab52 to ff0b132 Compare July 23, 2024 10:21
@clobrano
Copy link
Contributor Author

/test 4.16-openshift-e2e

Copy link
Member

@razo7 razo7 left a comment

Choose a reason for hiding this comment

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

Left small nits, and please update the PR title :)

Makefile Show resolved Hide resolved
@@ -1,12 +1,12 @@
module github.com/medik8s/fence-agents-remediation

go 1.20
go 1.22
Copy link
Member

Choose a reason for hiding this comment

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

Comment on lines +302 to +303
.PHONY: add-ocp-annotations
add-ocp-annotations: yq ## Add OCP annotations
Copy link
Member

Choose a reason for hiding this comment

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

Is there a reason to add it here (upstream) and not just downstream?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OKD is also verifying their existence.

medik8s/self-node-remediation#221

I will update the commit message

@clobrano
Copy link
Contributor Author

Dropping last commit, as it is already included in #150

@slintes slintes mentioned this pull request Jul 23, 2024
@clobrano
Copy link
Contributor Author

superseded by #152

@clobrano clobrano closed this Jul 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants