Makefile and other visual changes. #1522

kishen-v · 2023-11-30T13:15:32Z

What this PR does / why we need it:
Changes in this PR:

make serve is now made available from the parent Makefile and can be executed from the repository root.
README.md changes to fix the broken link of License, and other related badges, alignment of the images, etc.
Version bump of mdbook from v0.4.5 to v0.4.35.
Add make update-go to update golang version across multiple files.
Add make verify-go-version to find if there are any recent release of Go that can be updated.

Kishens-MacBook-Pro: cluster-api-provider-ibmcloud : mdbook-target ᐅ  make update-go VERSION=1.21.4 
-FROM --platform=${BUILDPLATFORM} golang:1.20.11 as toolchain
+FROM --platform=${BUILDPLATFORM} golang:1.21.4 as toolchain

-GO_VERSION ?= 1.20.11
+GO_VERSION ?= 1.21.4

-FROM golang:1.20.11 AS ccm-builder
+FROM golang:1.21.4 AS ccm-builder

Update favicon image to show clusterapi logo, from the default mdbook logo.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #1510

Special notes for your reviewer: This PR has multiple commits. Please let me know if it needs to be made into separate PRs.

/area provider/ibmcloud

Release note:

make serve is now made available from the parent Makefile and can be executed from the repository root.
README.md changes to fix the broken link of License, and other related badges, alignment of the images, etc.
Version bump of mdbook from v0.4.5 to v0.4.37.
Add make update-go to update golang version across Makefiles
Add make verify-go-version to find if inconsistencies exist across files with regards to go version in Make/Submakefiles.
Update favicon image to ClusterAPI logo.

netlify · 2023-11-30T13:15:39Z

✅ Deploy Preview for kubernetes-sigs-cluster-api-ibmcloud ready!

Name	Link
🔨 Latest commit	`4417e60`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cluster-api-ibmcloud/deploys/65c5d190058bee0008aea5ef
😎 Deploy Preview	https://deploy-preview-1522--kubernetes-sigs-cluster-api-ibmcloud.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

k8s-ci-robot · 2023-11-30T13:15:42Z

Hi @kishen-v. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

kishen-v · 2023-11-30T13:18:05Z

/cc @Amulyam24 @Prajyot-Parab.

Makefile

Prajyot-Parab · 2023-12-04T10:25:41Z

/ok-to-test

versions.mk

Makefile

Prajyot-Parab · 2023-12-04T10:55:30Z

What this PR does / why we need it: Changes in this PR:

make serve is now made available from the parent Makefile and can be executed from the repository root.

README.md changes to fix the broken link of License, and other related badges, alignment of the images, etc.

Version bump of mdbook from v0.4.5 to v0.4.35.

Add make update-go to update golang version across multiple files.
Kishens-MacBook-Pro: cluster-api-provider-ibmcloud : mdbook-target ᐅ  make update-go VERSION=1.21.4 
-FROM --platform=${BUILDPLATFORM} golang:1.20.11 as toolchain
+FROM --platform=${BUILDPLATFORM} golang:1.21.4 as toolchain

-GO_VERSION ?= 1.20.11
+GO_VERSION ?= 1.21.4

-FROM golang:1.20.11 AS ccm-builder
+FROM golang:1.21.4 AS ccm-builder
Update favicon image to show clusterapi logo, from the default mdbook logo.

**Which issue(s) this PR fixes** _(optional, in `fixes #(, fixes #, ...)` format, will close the issue(s) when PR gets merged)_: Fixes #1510
Special notes for your reviewer: This PR has multiple commits. Please let me know if it needs to be made into separate PRs.

/area provider/ibmcloud

Release note:
NONE

@kishen-v Update Release note section.

Makefile

kishen-v · 2023-12-15T15:21:18Z

Makefile

+	IFS=' ' read -r current_minor current_patch <<< "$$current_minor_patch_version"; \
+	if [ $$current_minor -le $$available_minor ]; then \
+		if [ $$current_patch -lt $$available_patch ] || [ $$current_minor -lt $$available_minor ]; then \
+			echo "::warning ::Update GO_VERSION to $$available_version"; \


Ref: https://stackoverflow.com/a/75849954

Prajyot-Parab · 2024-01-25T07:48:27Z

@kishen-v
Is this the expected behaviour?

prajyotparab@Prajyots-MacBook-Pro cluster-api-provider-ibmcloud % make verify-go-version
fatal: No names found, cannot describe anything.
::warning ::Update GO_VERSION to go1.20.13
go1.20.13 is available on go.dev, the version in Makefile is 1.20.12.
Consider bumping the version, run make update-go VERSION=go1.20.13 to update across all files.

Karthik-K-N

/lgtm

@Prajyot-Parab Please take a look

kishen-v · 2024-01-29T06:46:22Z

@Prajyot-Parab, If it's this line fatal: No names found, cannot describe anything.
I see the same error on my machine. I shall look into it.

Prajyot-Parab · 2024-01-29T06:52:30Z

@Prajyot-Parab, If it's this line fatal: No names found, cannot describe anything. I see the same error on my machine. I shall look into it.

Yes, please check.

Makefile

Prajyot-Parab

/lgtm

@Karthik-K-N ptal

Karthik-K-N

Thanks for the PR

/lgtm

kishen-v · 2024-02-07T14:43:27Z

Hi @Prajyot-Parab / @Karthik-K-N,

I have incorporated the discussed changes where:

Do away with go version set in the Makefile.
Retrieve the go-version from the Dockerfile in repository root.
Update go-version across all Dockerfiles in the repository.

Here are the o/ps.

Updating versions across all dockerfiles.

Kishens-MacBook-Pro:  cluster-api-provider-ibmcloud : mdbook-target :  make update-go VERSION=1.20.12
Updated go version to 1.20.12 across Dockerfile hack/ccm/Dockerfile

Verify that Go versions are same across all Dockerfiles

Kishens-MacBook-Pro:  cluster-api-provider-ibmcloud : mdbook-target : make verify-go-version
Versions are uniform across Dockerfiles, the go-version used is 1.20.12

And if not...

Kishens-MacBook-Pro: cluster-api-provider-ibmcloud : mdbook-target  :  make verify-go-version
Versions are different across Dockerfiles, please use 'make update-go'

cc: @mkumatag.

mkumatag

I will let @Prajyot-Parab to add lgtm

Prajyot-Parab · 2024-02-08T01:32:36Z

@kishen-v lets do it this way

Refer https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/Makefile#L23-L24 ,lets use same approach here, we will pass the image itself as build-arg to our docker commands and that way no need to fetch any version from Dockerfiles.
Lets have check in place to verify the version mentioned in Makefile and ccm dockerfile is same, If yes all good, If no just throw out warning saying version mismatch and suggest user to have consistency.
Also you can refer this older commit (3e0af2a) lets switch to this in ccm Dockerfile (this will avoid triggering update via depenbot), you can also pass that image as arg via ccm Makefile and have comparison done on it rather than Dockerfile
Lets not have any command in place to update the versions via make (drop that logic)

let me know incase of any queries.

Prajyot-Parab · 2024-02-08T18:35:31Z

@kishen-v squash everything into 1 commit. (rest lgtm)

Prajyot-Parab · 2024-02-09T05:42:02Z

/hold

Update mdbook version and add target to sub-Makefile Update badges, align images Add make command to update go version across files Add verify-go-version target

Prajyot-Parab

/lgtm

k8s-ci-robot · 2024-02-09T09:07:27Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Karthik-K-N, kishen-v, mkumatag, Prajyot-Parab

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

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

Prajyot-Parab · 2024-02-09T09:07:44Z

/unhold

k8s-ci-robot added the area/provider/ibmcloud Issues or PRs related to ibmcloud provider label Nov 30, 2023

k8s-ci-robot requested review from gyliu513 and Prajyot-Parab November 30, 2023 13:15

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 30, 2023

k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 30, 2023

mkumatag requested changes Nov 30, 2023

View reviewed changes

Makefile Outdated Show resolved Hide resolved

kishen-v commented Nov 30, 2023

View reviewed changes

Makefile Outdated Show resolved Hide resolved

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 4, 2023

Prajyot-Parab suggested changes Dec 4, 2023

View reviewed changes

versions.mk Outdated Show resolved Hide resolved

Makefile Outdated Show resolved Hide resolved

kishen-v force-pushed the mdbook-target branch 3 times, most recently from 0911e84 to 5078660 Compare December 15, 2023 14:36

kishen-v commented Dec 15, 2023

View reviewed changes

Makefile Show resolved Hide resolved

kishen-v commented Dec 15, 2023

View reviewed changes

kishen-v force-pushed the mdbook-target branch 3 times, most recently from 1caf951 to 44b176a Compare January 21, 2024 12:50

Karthik-K-N reviewed Jan 29, 2024

View reviewed changes

k8s-ci-robot assigned Karthik-K-N Jan 29, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 29, 2024

Prajyot-Parab reviewed Jan 31, 2024

View reviewed changes

Makefile Show resolved Hide resolved

kishen-v force-pushed the mdbook-target branch from 77af71c to 3c7d54e Compare February 1, 2024 01:01

Prajyot-Parab approved these changes Feb 5, 2024

View reviewed changes

k8s-ci-robot assigned Prajyot-Parab Feb 5, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 5, 2024

Karthik-K-N approved these changes Feb 7, 2024

View reviewed changes

kishen-v force-pushed the mdbook-target branch from 3c7d54e to a3c3ce2 Compare February 7, 2024 13:47

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 7, 2024

kishen-v force-pushed the mdbook-target branch from a3c3ce2 to d122b14 Compare February 7, 2024 14:42

kishen-v force-pushed the mdbook-target branch from d122b14 to ee9993b Compare February 7, 2024 14:46

mkumatag approved these changes Feb 8, 2024

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 8, 2024

kishen-v force-pushed the mdbook-target branch from 278ac8a to 2090935 Compare February 9, 2024 04:50

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 9, 2024

Makefile command addition for go version update and add CAPI badge

4417e60

Update mdbook version and add target to sub-Makefile Update badges, align images Add make command to update go version across files Add verify-go-version target

kishen-v force-pushed the mdbook-target branch from 2090935 to 4417e60 Compare February 9, 2024 07:17

Prajyot-Parab approved these changes Feb 9, 2024

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 9, 2024

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 9, 2024

k8s-ci-robot merged commit ea18e5b into kubernetes-sigs:main Feb 9, 2024
14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Makefile and other visual changes. #1522

Makefile and other visual changes. #1522

kishen-v commented Nov 30, 2023 •

edited

Loading

netlify bot commented Nov 30, 2023 •

edited

Loading

k8s-ci-robot commented Nov 30, 2023

kishen-v commented Nov 30, 2023

Prajyot-Parab commented Dec 4, 2023

Prajyot-Parab commented Dec 4, 2023

kishen-v Dec 15, 2023

Prajyot-Parab commented Jan 25, 2024

Karthik-K-N left a comment

kishen-v commented Jan 29, 2024

Prajyot-Parab commented Jan 29, 2024

Prajyot-Parab left a comment

Karthik-K-N left a comment

kishen-v commented Feb 7, 2024 •

edited

Loading

mkumatag left a comment

Prajyot-Parab commented Feb 8, 2024

Prajyot-Parab commented Feb 8, 2024

Prajyot-Parab commented Feb 9, 2024

Prajyot-Parab left a comment

k8s-ci-robot commented Feb 9, 2024

Prajyot-Parab commented Feb 9, 2024

Makefile and other visual changes. #1522

Makefile and other visual changes. #1522

Conversation

kishen-v commented Nov 30, 2023 • edited Loading

netlify bot commented Nov 30, 2023 • edited Loading

✅ Deploy Preview for kubernetes-sigs-cluster-api-ibmcloud ready!

k8s-ci-robot commented Nov 30, 2023

kishen-v commented Nov 30, 2023

Prajyot-Parab commented Dec 4, 2023

Prajyot-Parab commented Dec 4, 2023

kishen-v Dec 15, 2023

Choose a reason for hiding this comment

Prajyot-Parab commented Jan 25, 2024

Karthik-K-N left a comment

Choose a reason for hiding this comment

kishen-v commented Jan 29, 2024

Prajyot-Parab commented Jan 29, 2024

Prajyot-Parab left a comment

Choose a reason for hiding this comment

Karthik-K-N left a comment

Choose a reason for hiding this comment

kishen-v commented Feb 7, 2024 • edited Loading

mkumatag left a comment

Choose a reason for hiding this comment

Prajyot-Parab commented Feb 8, 2024

Prajyot-Parab commented Feb 8, 2024

Prajyot-Parab commented Feb 9, 2024

Prajyot-Parab left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Feb 9, 2024

Prajyot-Parab commented Feb 9, 2024

kishen-v commented Nov 30, 2023 •

edited

Loading

netlify bot commented Nov 30, 2023 •

edited

Loading

kishen-v commented Feb 7, 2024 •

edited

Loading