Skip to content

Commit 64a578d

Browse files
soltyshsoltysh
committed
Remove deprecated oc env/volume
1 parent f31bd3a commit 64a578d

File tree

9 files changed

+56
-58
lines changed

9 files changed

+56
-58
lines changed

‎docs/cli.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -449,35 +449,35 @@ For example, to edit the service `docker-registry` in JSON using the `v1` API fo
449449
$ oc edit svc/docker-registry --output-version=v1 -o json
450450
```
451451

452-
### oc env
452+
### oc set env
453453

454454
This updates the environment on a resource with a pod template.
455455
The general form is:
456456

457457
```bash
458-
$ oc env <resource-type>/<name> <k1>=<v1> <k2>=<v2>
458+
$ oc set env <resource-type>/<name> <k1>=<v1> <k2>=<v2>
459459
```
460460

461461
For example:
462462

463463
```bash
464-
$ oc env dc/app DB_USER=user DB_PASS=pass
464+
$ oc set env dc/app DB_USER=user DB_PASS=pass
465465
```
466466

467-
### oc volume
467+
### oc set volume
468468

469469
This controls the storage associated with various resources.
470470
The general form is:
471471

472472
```bash
473-
$ oc volume <resource-type>/<name> --<action> <options>
473+
$ oc set volume <resource-type>/<name> --<action> <options>
474474
```
475475

476476
where *action* is one of `add`, `remove`, `list` and *options* depends on *action*.
477477
For example, to arrange for the deployment configuration `registry` to access the host *_/opt_* directory, use:
478478

479479
```bash
480-
$ oc volume dc/registry --add --mount-path=/opt
480+
$ oc set volume dc/registry --add --mount-path=/opt
481481
```
482482

483483
### oc label

‎hack/lib/start.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ function os::start::registry() {
631631
# For testing purposes, ensure the quota objects are always up to date in the registry by
632632
# disabling project cache.
633633
oc adm registry --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}" --enforce-quota -o json | \
634-
oc env --config="${ADMIN_KUBECONFIG}" -f - --output json "REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_PROJECTCACHETTL=0" | \
634+
oc set env --config="${ADMIN_KUBECONFIG}" --local -f - --output json "REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_PROJECTCACHETTL=0" | \
635635
oc create --config="${ADMIN_KUBECONFIG}" -f -
636636
}
637637
readonly -f os::start::registry

‎pkg/oc/admin/router/router.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ func NewCmdRouter(f kcmdutil.Factory, parentName, name string, out, errout io.Wr
279279
cmd.Flags().StringVar(&cfg.ForceSubdomain, "force-subdomain", "", "A router path format to force on all routes used by this router (will ignore the route host value)")
280280
cmd.Flags().StringVar(&cfg.ImageTemplate.Format, "images", cfg.ImageTemplate.Format, "The image to base this router on - ${component} will be replaced with --type")
281281
cmd.Flags().BoolVar(&cfg.ImageTemplate.Latest, "latest-images", cfg.ImageTemplate.Latest, "If true, attempt to use the latest images for the router instead of the latest release.")
282-
cmd.Flags().StringVar(&cfg.Ports, "ports", cfg.Ports, "A comma delimited list of ports or port pairs that set the port in the router pod containerPort and hostPort. It also sets service port and targetPort to expose on the router pod. This does not modify the env variables. That can be done using oc env or by editing the router's dc. This is used when host-network=false.")
282+
cmd.Flags().StringVar(&cfg.Ports, "ports", cfg.Ports, "A comma delimited list of ports or port pairs that set the port in the router pod containerPort and hostPort. It also sets service port and targetPort to expose on the router pod. This does not modify the env variables. That can be done using oc set env or by editing the router's dc. This is used when host-network=false.")
283283
cmd.Flags().StringVar(&cfg.RouterCanonicalHostname, "router-canonical-hostname", cfg.RouterCanonicalHostname, "CanonicalHostname is the external host name for the router that can be used as a CNAME for the host requested for this route. This value is optional and may not be set in all cases.")
284284
cmd.Flags().Int32Var(&cfg.Replicas, "replicas", cfg.Replicas, "The replication factor of the router; commonly 2 when high availability is desired.")
285285
cmd.Flags().StringVar(&cfg.Labels, "labels", cfg.Labels, "A set of labels to uniquely identify the router and its components.")

‎pkg/oc/cli/cli.go

-2
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,6 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *
211211
"options",
212212
"deploy",
213213
// These commands are deprecated and should not appear in help
214-
moved(fullName, "set env", cmds, set.NewCmdEnv(fullName, f, ioStreams)),
215-
moved(fullName, "set volume", cmds, set.NewCmdVolume(fullName, f, ioStreams)),
216214
moved(fullName, "logs", cmds, cmd.NewCmdBuildLogs(fullName, f, ioStreams)),
217215
moved(fullName, "secrets link", secretcmds, secrets.NewCmdLinkSecret("add", fullName, f, ioStreams)),
218216
moved(fullName, "create secret", secretcmds, secrets.NewCmdCreateSecret(secrets.NewSecretRecommendedCommandName, fullName, f, ioStreams)),

‎test/cmd/admin.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ os::cmd::expect_success "oc adm registry --images='${USE_IMAGES}'"
368368
os::cmd::expect_success_and_text 'oc adm registry' 'service exists'
369369
os::cmd::expect_success_and_text 'oc describe svc/docker-registry' 'Session Affinity:\s*ClientIP'
370370
os::cmd::expect_success_and_text 'oc get dc/docker-registry -o yaml' 'readinessProbe'
371-
os::cmd::expect_success_and_text 'oc env --list dc/docker-registry' 'REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_ENFORCEQUOTA=false'
371+
os::cmd::expect_success_and_text 'oc set env --list dc/docker-registry' 'REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_ENFORCEQUOTA=false'
372372
echo "registry: ok"
373373
os::test::junit::declare_suite_end
374374

‎test/cmd/deployments.sh

+35-35
Original file line numberDiff line numberDiff line change
@@ -26,43 +26,43 @@ os::cmd::try_until_text 'oc status' 'pod/hello-openshift runs openshift/hello-op
2626

2727
os::test::junit::declare_suite_start "cmd/deployments/env"
2828
# Patch a nil list
29-
os::cmd::expect_success 'oc env dc/test-deployment-config TEST=value'
30-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'TEST=value'
29+
os::cmd::expect_success 'oc set env dc/test-deployment-config TEST=value'
30+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'TEST=value'
3131
# Remove only env in the list
32-
os::cmd::expect_success 'oc env dc/test-deployment-config TEST-'
33-
os::cmd::expect_success_and_not_text 'oc env dc/test-deployment-config --list' 'TEST=value'
32+
os::cmd::expect_success 'oc set env dc/test-deployment-config TEST-'
33+
os::cmd::expect_success_and_not_text 'oc set env dc/test-deployment-config --list' 'TEST=value'
3434
# Add back to empty list
35-
os::cmd::expect_success 'oc env dc/test-deployment-config TEST=value'
36-
os::cmd::expect_success_and_not_text 'oc env dc/test-deployment-config TEST=foo --list' 'TEST=value'
37-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config TEST=foo --list' 'TEST=foo'
38-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config OTHER=foo --list' 'TEST=value'
39-
os::cmd::expect_success_and_not_text 'oc env dc/test-deployment-config OTHER=foo -c ruby --list' 'OTHER=foo'
40-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config OTHER=foo -c ruby* --list' 'OTHER=foo'
41-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config OTHER=foo -c *hello* --list' 'OTHER=foo'
42-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config OTHER=foo -c *world --list' 'OTHER=foo'
43-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config OTHER=foo --list' 'OTHER=foo'
44-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config OTHER=foo -o yaml' 'name: OTHER'
45-
os::cmd::expect_success_and_text 'echo OTHER=foo | oc env dc/test-deployment-config -e - --list' 'OTHER=foo'
46-
os::cmd::expect_success_and_not_text 'echo #OTHER=foo | oc env dc/test-deployment-config -e - --list' 'OTHER=foo'
47-
os::cmd::expect_success 'oc env dc/test-deployment-config TEST=bar OTHER=baz BAR-'
48-
os::cmd::expect_success_and_text 'oc env -f test/integration/testdata/test-deployment-config.yaml TEST=VERSION -o yaml' 'v1'
49-
os::cmd::expect_success 'oc env dc/test-deployment-config A=a B=b C=c D=d E=e F=f G=g'
50-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'A=a'
51-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'B=b'
52-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'C=c'
53-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'D=d'
54-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'E=e'
55-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'F=f'
56-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'G=g'
57-
os::cmd::expect_success 'oc env dc/test-deployment-config H=h G- E=updated C- A-'
58-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'B=b'
59-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'D=d'
60-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'E=updated'
61-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'F=f'
62-
os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'H=h'
63-
os::cmd::expect_success_and_not_text 'oc env dc/test-deployment-config --list' 'A=a'
64-
os::cmd::expect_success_and_not_text 'oc env dc/test-deployment-config --list' 'C=c'
65-
os::cmd::expect_success_and_not_text 'oc env dc/test-deployment-config --list' 'G=g'
35+
os::cmd::expect_success 'oc set env dc/test-deployment-config TEST=value'
36+
os::cmd::expect_success_and_not_text 'oc set env dc/test-deployment-config TEST=foo --list' 'TEST=value'
37+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config TEST=foo --list' 'TEST=foo'
38+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config OTHER=foo --list' 'TEST=value'
39+
os::cmd::expect_success_and_not_text 'oc set env dc/test-deployment-config OTHER=foo -c ruby --list' 'OTHER=foo'
40+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config OTHER=foo -c ruby* --list' 'OTHER=foo'
41+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config OTHER=foo -c *hello* --list' 'OTHER=foo'
42+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config OTHER=foo -c *world --list' 'OTHER=foo'
43+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config OTHER=foo --list' 'OTHER=foo'
44+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config OTHER=foo -o yaml' 'name: OTHER'
45+
os::cmd::expect_success_and_text 'echo OTHER=foo | oc set env dc/test-deployment-config -e - --list' 'OTHER=foo'
46+
os::cmd::expect_success_and_not_text 'echo #OTHER=foo | oc set env dc/test-deployment-config -e - --list' 'OTHER=foo'
47+
os::cmd::expect_success 'oc set env dc/test-deployment-config TEST=bar OTHER=baz BAR-'
48+
os::cmd::expect_success_and_text 'oc set env -f test/integration/testdata/test-deployment-config.yaml TEST=VERSION -o yaml' 'v1'
49+
os::cmd::expect_success 'oc set env dc/test-deployment-config A=a B=b C=c D=d E=e F=f G=g'
50+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'A=a'
51+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'B=b'
52+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'C=c'
53+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'D=d'
54+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'E=e'
55+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'F=f'
56+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'G=g'
57+
os::cmd::expect_success 'oc set env dc/test-deployment-config H=h G- E=updated C- A-'
58+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'B=b'
59+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'D=d'
60+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'E=updated'
61+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'F=f'
62+
os::cmd::expect_success_and_text 'oc set env dc/test-deployment-config --list' 'H=h'
63+
os::cmd::expect_success_and_not_text 'oc set env dc/test-deployment-config --list' 'A=a'
64+
os::cmd::expect_success_and_not_text 'oc set env dc/test-deployment-config --list' 'C=c'
65+
os::cmd::expect_success_and_not_text 'oc set env dc/test-deployment-config --list' 'G=g'
6666
echo "env: ok"
6767
os::test::junit::declare_suite_end
6868

‎test/cmd/volumes.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ os::test::junit::declare_suite_start "cmd/volumes"
1616
os::cmd::expect_success 'oc create -f test/integration/testdata/test-deployment-config.yaml'
1717
os::cmd::expect_success 'oc create -f test/testdata/rollingupdate-daemonset.yaml'
1818

19-
os::cmd::expect_success_and_text 'oc volume dc/test-deployment-config --list' 'vol1'
20-
os::cmd::expect_success 'oc volume dc/test-deployment-config --add --name=vol0 -m /opt5'
19+
os::cmd::expect_success_and_text 'oc set volume dc/test-deployment-config --list' 'vol1'
20+
os::cmd::expect_success 'oc set volume dc/test-deployment-config --add --name=vol0 -m /opt5'
2121
os::cmd::expect_success 'oc set volume dc/test-deployment-config --add --name=vol2 --type=emptydir -m /opt'
2222
os::cmd::expect_failure_and_text "oc set volume dc/test-deployment-config --add --name=vol1 --type=secret --secret-name='\$ecret' -m /data" 'overwrite to replace'
2323
os::cmd::expect_success "oc set volume dc/test-deployment-config --add --name=vol10 --secret-name='my-secret' -m /data-2"
@@ -42,18 +42,18 @@ os::cmd::expect_success_and_not_text 'oc set volume dc/test-deployment-config --
4242
os::cmd::expect_success 'oc set volume ds/bind --add --name=vol2 --type=emptydir -m /opt'
4343
os::cmd::expect_success 'oc set volume ds/bind --remove --name=vol2'
4444

45-
os::cmd::expect_success "oc volume dc/test-deployment-config --add -t 'secret' --secret-name='asdf' --default-mode '765'"
45+
os::cmd::expect_success "oc set volume dc/test-deployment-config --add -t 'secret' --secret-name='asdf' --default-mode '765'"
4646
os::cmd::expect_success_and_text 'oc get dc/test-deployment-config -o jsonpath={.spec.template.spec.volumes[0]}' '501'
4747
os::cmd::expect_success 'oc set volume dc/test-deployment-config --remove --confirm'
4848

49-
os::cmd::expect_failure "oc volume dc/test-deployment-config --add -t 'secret' --secret-name='asdf' --default-mode '888'"
49+
os::cmd::expect_failure "oc set volume dc/test-deployment-config --add -t 'secret' --secret-name='asdf' --default-mode '888'"
5050

51-
os::cmd::expect_success "oc volume dc/test-deployment-config --add -t 'configmap' --configmap-name='asdf' --default-mode '123'"
51+
os::cmd::expect_success "oc set volume dc/test-deployment-config --add -t 'configmap' --configmap-name='asdf' --default-mode '123'"
5252
os::cmd::expect_success_and_text 'oc get dc/test-deployment-config -o jsonpath={.spec.template.spec.volumes[0]}' '83'
5353
os::cmd::expect_success 'oc set volume dc/test-deployment-config --remove --confirm'
5454

5555
os::cmd::expect_success_and_text 'oc get pvc --no-headers | wc -l' '0'
56-
os::cmd::expect_success 'oc volume dc/test-deployment-config --add --mount-path=/other --claim-size=1G'
56+
os::cmd::expect_success 'oc set volume dc/test-deployment-config --add --mount-path=/other --claim-size=1G'
5757
os::cmd::expect_success 'oc set volume dc/test-deployment-config --add --mount-path=/second --type=pvc --claim-size=1G --claim-mode=rwo'
5858
os::cmd::expect_success_and_text 'oc get pvc --no-headers | wc -l' '2'
5959
# attempt to add the same volume mounted in /other, but with a subpath
@@ -88,10 +88,10 @@ spec:
8888
os::cmd::expect_success_and_text 'oc get dc simple-dc' 'simple-dc'
8989
os::cmd::expect_success 'oc create cm cmvol'
9090
os::cmd::expect_success 'oc set volume dc/simple-dc --add --name=cmvolume --type=configmap --configmap-name=cmvol'
91-
os::cmd::expect_success_and_text 'oc volume dc/simple-dc' 'configMap/cmvol as cmvolume'
91+
os::cmd::expect_success_and_text 'oc set volume dc/simple-dc' 'configMap/cmvol as cmvolume'
9292

9393
# command alias
94-
os::cmd::expect_success 'oc volumes --help'
94+
os::cmd::expect_success 'oc set volumes --help'
9595
os::cmd::expect_success 'oc set volumes --help'
9696
os::cmd::expect_success 'oc set volumes dc/test-deployment-config --list'
9797

‎test/end-to-end/core.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ os::cmd::expect_success "dig @${DNS_SERVICE_IP} docker-registry.default.local. A
110110

111111
os::log::info "Configure registry to disable mirroring"
112112
os::cmd::expect_success "oc project '${CLUSTER_ADMIN_CONTEXT}'"
113-
os::cmd::expect_success 'oc env -n default dc/docker-registry REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_MIRRORPULLTHROUGH=false'
113+
os::cmd::expect_success 'oc set env -n default dc/docker-registry REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_MIRRORPULLTHROUGH=false'
114114
os::cmd::expect_success 'oc rollout status dc/docker-registry'
115115
os::log::info "Registry configured to disable mirroring"
116116

@@ -127,7 +127,7 @@ os::cmd::expect_success "oc get istag/busybox:latest"
127127

128128
os::log::info "Restore registry mirroring"
129129
os::cmd::expect_success "oc project '${CLUSTER_ADMIN_CONTEXT}'"
130-
os::cmd::expect_success 'oc env -n default dc/docker-registry REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_MIRRORPULLTHROUGH=true'
130+
os::cmd::expect_success 'oc set env -n default dc/docker-registry REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_MIRRORPULLTHROUGH=true'
131131
os::cmd::expect_success 'oc rollout status dc/docker-registry'
132132
os::log::info "Restore configured to enable mirroring"
133133

@@ -625,7 +625,7 @@ os::log::info "Validated image pruning"
625625
# with registry's re-deployment we loose all the blobs stored in its storage until now
626626
os::log::info "Configure registry to accept manifest V2 schema 2"
627627
os::cmd::expect_success "oc project '${CLUSTER_ADMIN_CONTEXT}'"
628-
os::cmd::expect_success 'oc env -n default dc/docker-registry REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_ACCEPTSCHEMA2=true'
628+
os::cmd::expect_success 'oc set env -n default dc/docker-registry REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_ACCEPTSCHEMA2=true'
629629
os::cmd::expect_success 'oc rollout status dc/docker-registry'
630630
os::log::info "Registry configured to accept manifest V2 schema 2"
631631

‎test/extended/cmd.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ VERBOSE=true os::cmd::expect_success "oc new-project service-serving-cert-genera
155155
os::cmd::expect_success 'oc create dc nginx --image=nginx -- sh -c "nginx -c /etc/nginx/nginx.conf && sleep 86400"'
156156
os::cmd::expect_success "oc expose dc/nginx --port=443"
157157
os::cmd::expect_success "oc annotate svc/nginx service.alpha.openshift.io/serving-cert-secret-name=nginx-ssl-key"
158-
os::cmd::expect_success "oc volumes dc/nginx --add --secret-name=nginx-ssl-key --mount-path=/etc/serving-cert"
158+
os::cmd::expect_success "oc set volumes dc/nginx --add --secret-name=nginx-ssl-key --mount-path=/etc/serving-cert"
159159
os::cmd::expect_success "oc create configmap default-conf --from-file=test/extended/testdata/service-serving-cert/nginx-serving-cert.conf"
160160
os::cmd::expect_success "oc set volumes dc/nginx --add --configmap-name=default-conf --mount-path=/etc/nginx/conf.d"
161161
os::cmd::try_until_text "oc get pods -l deployment-config.name=nginx" 'Running'

0 commit comments

Comments
 (0)