*: rename `packet` to `equinixmetal` #277

tormath1 · 2022-01-17T14:02:18Z

marked --packet-* options as deprecated (still work but not visible)
added packet aliase for ore commands

Signed-off-by: Mathieu Tortuyaux [email protected]

Example with current commands:

+ sudo ./bin/kola run --packet-api-key=1234 --packet-facility=xx --packet-image-url=https://bucket.release.flatcar-linux.net/flatcar-jenkins/stable/boards/amd64-usr/3033.2.0/flatcar_production_packet_image.bin.bz2 --packet-installer-image-base-url=https://bucket.release.flatcar-linux.net/flatcar-jenkins/stable/boards/amd64-usr/3033.2.0 --packet-project=1234 ... kubeadm.v1.23.0.flannel.base
Flag --packet-api-key has been deprecated, packet options are deprecated, please update to equinixmetal options
Flag --packet-facility has been deprecated, packet options are deprecated, please update to equinixmetal options
Flag --packet-image-url has been deprecated, packet options are deprecated, please update to equinixmetal options
Flag --packet-installer-image-base-url has been deprecated, packet options are deprecated, please update to equinixmetal options
Flag --packet-project has been deprecated, packet options are deprecated, please update to equinixmetal options
Flag --packet-storage-url has been deprecated, packet options are deprecated, please update to equinixmetal options
2022-01-17T14:04:29Z cli: Started logging at level DEBUG
packet platform is deprecated, updating to equinixmetal
2022/01/17 15:04:29 [DEBUG] POST https://api.packet.net/ssh-keys
=== RUN   kubeadm.v1.23.0.flannel.base

and for ore command:

./bin/ore equinixmetal --help
EquinixMetal machine utilities

Usage:
  ore equinixmetal [command]

Aliases:
  equinixmetal, packet
...

Changelog entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update)

Closes: flatcar/Flatcar#561

jepio

Like it, thanks for keeping the old flags supported for the transition.

krnowak · 2022-01-17T18:42:41Z

CHANGELOG.md

@@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - plume: Add new AWS regions, af-south-1, ap-southeast-3, eu-south-1 ([#274](https://github.com/flatcar-linux/mantle/pull/274))
 - kubernetes test for release 1.23.0 ([#275](https://github.com/flatcar-linux/mantle/pull/275))

+### Changed
+- removed `packet` occurences in favor of `equinixmetal` ([#277](https://github.com/flatcar-linux/mantle/pull/277))


Suggested change

- removed `packet` occurences in favor of `equinixmetal` ([#277](https://github.com/flatcar-linux/mantle/pull/277))

- removed `packet` occurrences in favor of `equinixmetal` ([#277](https://github.com/flatcar-linux/mantle/pull/277))

krnowak · 2022-01-17T18:45:51Z

cmd/ore/equinixmetal/create-device.go

-	cmdCreateDevice.Flags().StringVar(&options.ImageURL, "image-url", "", "image base URL (default board-dependent, e.g. \"https://alpha.release.flatcar-linux.net/amd64-usr/current/flatcar_production_packet_image.bin.bz2\")")
+	cmdCreateDevice.Flags().StringVar(&options.InstallerImageKernelURL, "installer-image-kernel-url", "", "EquinixMetal installer image kernel URL, (default installer-image-base-url/flatcar_production_pxe.vmlinuz)")
+	cmdCreateDevice.Flags().StringVar(&options.InstallerImageCpioURL, "installer-image-cpio-url", "", "EquinixMetal installer image cpio URL, (default installer-image-base-url/flatcar_production_pxe_image.cpio.gz)")
+	cmdCreateDevice.Flags().StringVar(&options.ImageURL, "image-url", "", "image base URL (default board-dependent, e.g. \"https://alpha.release.flatcar-linux.net/amd64-usr/current/flatcar_production_equinixmetal_image.bin.bz2\")")


Hm, this link is 404 as we still produce "packet" images, not "equinixmetal" ones.

Good catch, I tried to preserve the URL links but I missed this one. It's just an example value but let's keep things correct. :)

tormath1 · 2022-01-18T09:11:43Z

@krnowak your suggestions are committed. I also took the opportunity to split into two commits: sed + backward compatibility to ease the revert of the last one later.

krnowak · 2022-01-18T11:19:27Z

auth/equinixmetal.go

@@ -22,26 +22,26 @@ import (
 	"path/filepath"
 )

-const PacketConfigPath = ".config/packet.json"
+const EquinixMetalConfigPath = ".config/equinixmetal.json"


I'm wondering if this won't break if someone had a config named packet.json. This value is used as a default value for --packet-config-file (now --equinixmetal-config-file). I haven't seen --packet-config-file being used in our Jenkins setup, so not sure we should care.

It is also used in ore equinixmetal --config-file too.

I had a doubt for this one, at first I started to support both - but I dropped the idea since it's a default config... Not sure about what we should do.

Eh, if something breaks then we can revert this one line.

sayanchowdhury · 2022-01-18T14:08:57Z

cmd/ore/equinixmetal/equinixmetal.go

@@ -0,0 +1,70 @@
+// Copyright 2017 CoreOS, Inc.


Let's update the license here with the #263 changes.

Thanks, since it's a brand new file, header has been updated to:

// Copyright The Mantle Authors // SPDX-License-Identifier: Apache-2.0

I wouldn't say it's a new file - just a rename of an old one…

kola/tests/flannel/flannel.go

tormath1 · 2022-01-18T14:23:19Z

@sayanchowdhury thanks for your suggestion - comments have been addressed.

pothos · 2022-01-18T15:31:52Z

cmd/ore/equinixmetal/equinixmetal.go

@@ -0,0 +1,59 @@
+// Copyright The Mantle Authors


Suggested change

// Copyright The Mantle Authors

// Copyright The Mantle Authors

// Copyright 2017 CoreOS, Inc.

Original copyright statements should not be removed

Ouh yes. Thanks !

Signed-off-by: Mathieu Tortuyaux <[email protected]>

* marked `--packet-*` options as deprecated (still work but not visible) * added `packet` aliase for `ore` commands Signed-off-by: Mathieu Tortuyaux <[email protected]>

Signed-off-by: Mathieu Tortuyaux <[email protected]>

Follow up from: flatcar/mantle#277 Signed-off-by: Mathieu Tortuyaux <[email protected]>

tormath1 self-assigned this Jan 17, 2022

tormath1 marked this pull request as ready for review January 17, 2022 14:22

tormath1 requested a review from a team January 17, 2022 14:23

jepio approved these changes Jan 17, 2022

View reviewed changes

krnowak reviewed Jan 17, 2022

View reviewed changes

tormath1 force-pushed the tormath1/bye-packet branch from 06f2f6f to 1f8745d Compare January 18, 2022 09:10

krnowak reviewed Jan 18, 2022

View reviewed changes

krnowak approved these changes Jan 18, 2022

View reviewed changes

sayanchowdhury reviewed Jan 18, 2022

View reviewed changes

tormath1 force-pushed the tormath1/bye-packet branch from 0a79114 to 3a52ee1 Compare January 18, 2022 14:22

sayanchowdhury approved these changes Jan 18, 2022

View reviewed changes

pothos reviewed Jan 18, 2022

View reviewed changes

tormath1 added 3 commits January 18, 2022 16:38

*: rename packet to equinixmetal

aee8c43

Signed-off-by: Mathieu Tortuyaux <[email protected]>

*: mitigate equinixmetal renaming

5f1f06e

* marked `--packet-*` options as deprecated (still work but not visible) * added `packet` aliase for `ore` commands Signed-off-by: Mathieu Tortuyaux <[email protected]>

changelog: add entry

bbbe9e9

Signed-off-by: Mathieu Tortuyaux <[email protected]>

tormath1 force-pushed the tormath1/bye-packet branch from 3a52ee1 to bbbe9e9 Compare January 18, 2022 15:38

tormath1 merged commit 2e8c1c8 into flatcar-master Jan 21, 2022

tormath1 deleted the tormath1/bye-packet branch January 21, 2022 10:25

tormath1 added a commit to flatcar/scripts that referenced this pull request Jan 26, 2022

jenkins/kola/packet: rename to equinixmetal

31c4a95

Follow up from: flatcar/mantle#277 Signed-off-by: Mathieu Tortuyaux <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

*: rename `packet` to `equinixmetal` #277

*: rename `packet` to `equinixmetal` #277

tormath1 commented Jan 17, 2022 •

edited

Loading

jepio left a comment

krnowak Jan 17, 2022

krnowak Jan 17, 2022

tormath1 Jan 18, 2022

tormath1 commented Jan 18, 2022

krnowak Jan 18, 2022

tormath1 Jan 18, 2022

krnowak Jan 18, 2022

sayanchowdhury Jan 18, 2022 •

edited

Loading

tormath1 Jan 18, 2022

krnowak Jan 18, 2022

pothos Jan 18, 2022

tormath1 commented Jan 18, 2022

pothos Jan 18, 2022

pothos Jan 18, 2022

tormath1 Jan 18, 2022

	- removed `packet` occurences in favor of `equinixmetal` ([#277](https://github.com/flatcar-linux/mantle/pull/277))
	- removed `packet` occurrences in favor of `equinixmetal` ([#277](https://github.com/flatcar-linux/mantle/pull/277))

	// Copyright The Mantle Authors
	// Copyright The Mantle Authors
	// Copyright 2017 CoreOS, Inc.

*: rename packet to equinixmetal #277

*: rename packet to equinixmetal #277

Conversation

tormath1 commented Jan 17, 2022 • edited Loading

jepio left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tormath1 commented Jan 18, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sayanchowdhury Jan 18, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tormath1 commented Jan 18, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

*: rename `packet` to `equinixmetal` #277

*: rename `packet` to `equinixmetal` #277

tormath1 commented Jan 17, 2022 •

edited

Loading

sayanchowdhury Jan 18, 2022 •

edited

Loading