8000 rkt: Remove the deprecated --insecure-skip-verify flag by krnowak · Pull Request #2068 · rkt/rkt · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Feb 24, 2020. It is now read-only.

rkt: Remove the deprecated --insecure-skip-verify flag #2068

Merged
merged 1 commit into from
Feb 2, 2016
Merged

rkt: Remove the deprecated --insecure-skip-verify flag #2068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
- Add pod creation and start times to `rkt list` and `rkt status` ([#2030](https://github.com/coreos/rkt/pull/2030)). See [`rkt list`](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/list.md) and [`rkt status`](https://github.com/coreos/rkt/blob/master/Documentation/subcommands/status.md) documentation.
- The DNS configuration can now be passed to the pod via the command line ([#2040](https://github.com/coreos/rkt/pull/2040)). See [`DNS support`](https://github.com/coreos/rkt/blob/master/Documentation/networking.md#dns-support) documentation.
- Errors are now structured, allowing for better control of the output. See [#1937](https://github.com/coreos/rkt/pull/1937) for background and the [Error & Output](https://github.com/coreos/rkt/blob/master/Documentation/hacking.md#errors--output) section of the Hacking document for usage.
- All output now uses the new log package in `pkg/log` to provide a more clean and consistent output format and more helpful debug output. See [#1937](https://github.com/coreos/rkt/pull/1937)
- All output now uses the new log package in `pkg/log` to provide a more clean and consistent output format and more helpful debug output. See [#1937](https://github.com/coreos/rkt/pull/1937).
- Added configuration for stage1 image. Users can drop a configuration file to `/etc/rkt/stage1.d` (or to `stage1.d` in the user configuration directory) to tell rkt to use a different stage1 image name, version and location instead of build-time defaults ([#1977](https://github.com/coreos/rkt/pull/1977)).
- Replaced the `--stage1-image` flag with a new set of flags. `--stage1-url`, `--stage-path`, `--stage1-name` do the usual fetching from remote if the image does not exist in the store. `--stage1-hash` takes the stage1 image directly from the store. `--stage1-from-dir` works together with the default stage1 images directory and is described in the next point ([#1977](https://github.com/coreos/rkt/pull/1977)).
- Added default stage1 images directory. User can use the newly added `--stage1-from-dir` parameter to avoid typing the full path. `--stage1-from-dir` behaves like `--stage1-path` ([#1977](https://github.com/coreos/rkt/pull/1977)).
- Removed the deprecated `--insecure-skip-verify` flag ([#2068](https://github.com/coreos/rkt/pull/2068)).

#### Bug fixes

Expand All @@ -21,6 +22,7 @@
#### Migration

- The `--stage1-image` flag was removed. Scripts using it should be updated to use one of `--stage1-url`, `--stage1-path`, `--stage1-name`, `--stage1-hash` or `--stage1-from-dir`
- All uses of the deprecated `--insecure-skip-verify` flag should be replaced with the `--insecure-options` flag which allows user to selectively disable security features.

#### Note for packagers

Expand Down
24 changes: 0 additions & 24 deletions dist/bash_completion/rkt.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ _rkt_api-service()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -266,7 +265,6 @@ _rkt_cat-manifest()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -290,7 +288,6 @@ _rkt_enter()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -316,7 +313,6 @@ _rkt_fetch()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -341,7 +337,6 @@ _rkt_gc()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -365,7 +360,6 @@ _rkt_image_cat-manifest()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -389,7 +383,6 @@ _rkt_image_export()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -414,7 +407,6 @@ _rkt_image_extract()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -438,7 +430,6 @@ _rkt_image_gc()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand Down Expand Up @@ -466,7 +457,6 @@ _rkt_image_list()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -491,7 +481,6 @@ _rkt_image_render()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -514,7 +503,6 @@ _rkt_image_rm()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand Down Expand Up @@ -544,7 +532,6 @@ _rkt_image()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -567,7 +554,6 @@ _rkt_install()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -592,7 +578,6 @@ _rkt_list()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -616,7 +601,6 @@ _rkt_metadata-service()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand Down Expand Up @@ -656,7 +640,6 @@ _rkt_prepare()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -680,7 +663,6 @@ _rkt_rm()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand Down Expand Up @@ -726,7 +708,6 @@ _rkt_run()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -752,7 +733,6 @@ _rkt_run-prepared()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -776,7 +756,6 @@ _rkt_status()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -803,7 +782,6 @@ _rkt_trust()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand All @@ -826,7 +804,6 @@ _rkt_version()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand Down Expand Up @@ -865,7 +842,6 @@ _rkt()
flags+=("--debug")
flags+=("--dir=")
flags+=("--insecure-options=")
flags+=("--insecure-skip-verify")
flags+=("--user-config=")
flags+=("--local-config=")
flags+=("--system-config=")
Expand Down
66 changes: 0 additions & 66 deletions rkt/flag/skip_verify.go
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions rkt/flag/skip_verify_test.go
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions rkt/rkt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,6 @@ func init() {
stdout = log.New(os.Stdout, "", false)
}

// TODO: Remove before 1.0
rktflag.InstallDeprecatedSkipVerify(cmdRkt.PersistentFlags(), sf)

cobra.EnablePrefixMatching = true
}

Expand Down
2 changes: 1 addition & 1 deletion tests/rkt_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func TestRktListCreatedStarted(t *testing.T) {
defer ctx.Cleanup()

// Prepare image
cmd := fmt.Sprintf("%s --insecure-skip-verify prepare %s", ctx.Cmd(), imgID.path)
cmd := fmt.Sprintf("%s --insecure-options=image prepare %s", ctx.Cmd(), imgID.path)
podUuid := runRktAndGetUUID(t, cmd)

// t0: prepare
Expand Down
0