Don't use nginx image for the Pod example #10618

mburke5678 · 2018-07-03T19:52:09Z

sjenning · 2018-07-05T17:00:24Z

architecture/additional_concepts/storage.adoc

@@ -596,7 +596,7 @@ metadata:
 spec:
  containers:
    - name: myfrontend
-      image: dockerfile/nginx
+      image: dockerfile/redis


let's not change this one. it doesn't run with dockerfile/nginx anyway and the volumeMounts below don't make sense with redis.

sjenning · 2018-07-05T17:07:20Z

install_config/persistent_storage/topics/glusterfs_using_storage.adoc

    ports:
    - name: web
      containerPort: 80
    volumeMounts:
    - name: gluster-vol1
-      mountPath: /usr/share/nginx/html
+      mountPath: /usr/share/hello-openshift/html


this volumeMount doesn't make sense for hello-openshift. might leave this one as-is since the volumeMount is needed to demonstrate using the gluster volume.

sjenning · 2018-07-05T17:09:13Z

install_config/storage_examples/privileged_pod_storage.adoc

-    - name: gluster-nginx-priv
-      image: fedora/nginx
+    - name: gluster-S3-priv
+      image: fedora/S3


not sure what the mechanism of this image are

@mdshuai Any thoughts on this change ^^

I don't think we have an image with this name.

# docker pull fedora/nginx
Using default tag: latest
Trying to pull repository registry.access.redhat.com/fedora/nginx ...
Trying to pull repository registry.reg-aws.openshift.com:443/fedora/nginx ...
Pulling repository registry.reg-aws.openshift.com:443/fedora/nginx
Trying to pull repository docker.io/fedora/nginx ...
latest: Pulling from docker.io/fedora/nginx
......

# docker pull fedora/S3
Error parsing reference: "fedora/S3" is not a valid repository/tag

# docker pull fedora/s3
Using default tag: latest
Trying to pull repository registry.access.redhat.com/fedora/s3 ...
Trying to pull repository registry.reg-aws.openshift.com:443/fedora/s3 ...
Pulling repository registry.reg-aws.openshift.com:443/fedora/s3
Trying to pull repository docker.io/fedora/s3 ...
Pulling repository docker.io/fedora/s3
Error: image fedora/s3:latest not found

@liangxia @sjenning
Can we leave the original gluster-nginx-priv here as the section specifically requires "A user with the cluster-admin role binding." Does this cover the super-user privileges that was the original concern of the submitter, @nak3

@sjenning @liangxia @nak3 ^^

I'm OK to revert this specific one.

mburke5678 · 2018-07-11T19:24:12Z

@mdshuai PTAL

mburke5678 · 2018-07-11T19:26:55Z

@nak3 @sjenning Should this change roll back to 3.1, which the version cited in the issue originally?

sjenning · 2018-07-13T20:17:47Z

i don't see the harm in it if it isn't too much trouble

mburke5678 · 2018-07-19T14:25:48Z

@mdshuai PTAL

mdshuai · 2018-08-01T03:14:45Z

@liangxia help storage example

liangxia · 2018-08-06T02:51:34Z

Upper case NGINX are not updated, e.g, https://github.com/openshift/openshift-docs/pull/10618/files#diff-492418d8b4b3aa3ae12668611e127d51R3

liangxia · 2018-08-06T02:54:30Z

install_config/persistent_storage/topics/glusterfs_using_storage.adoc

-$ oc exec -ti nginx-pod /bin/sh
-$ cd /usr/share/nginx/html
+$ oc exec -ti hello-openshift-pod /bin/sh
+$ cd /usr/share/hello-openshift/html


The path coming from https://github.com/openshift/openshift-docs/pull/10618/files#diff-492418d8b4b3aa3ae12668611e127d51R24 should not be updated.

liangxia · 2018-08-06T02:58:48Z

install_config/persistent_storage/topics/glusterfs_using_storage.adoc

 ----

 . Now `curl` the pod again and it should still have the same data as before.
 Note that its IP address may have changed:
 +
 ----
 # curl http://10.37.0.0
-Hello World from GlusterFS!!!
+Hello OpenShift!!!


The string coming from https://github.com/openshift/openshift-docs/pull/10618/files#diff-492418d8b4b3aa3ae12668611e127d51R55
They should be sync. Update both of them or none of them.

@mburke5678, is this the right string?

liangxia · 2018-08-06T02:59:14Z

install_config/persistent_storage/topics/glusterfs_using_storage.adoc

@@ -98,5 +98,5 @@ $ cd /var/lib/heketi/mounts/vg_f92e09091f6b20ab12b02a2513e4ed90/brick_d8c06e606f
 $ ls
 index.html
 $ cat index.html
-Hello World from GlusterFS!!!
+Hello OpenShift!!!


liangxia · 2018-08-06T03:02:57Z

install_config/storage_examples/shared_storage.adoc

-    - name: nginx-nfs-pod
-      image: fedora/nginx <2>
+    - name: hello-openshift-nfs-pod
+      image: fedora/S3 <2>


We do not have image fedora/S3. Perhaps use openshift/hello-openshift here.

liangxia · 2018-08-06T03:03:32Z

install_config/storage_examples/shared_storage.adoc

      ports:
        - name: web
          containerPort: 80
      volumeMounts:
        - name: nfsvol <3>
-          mountPath: /usr/share/nginx/html <4>
+          mountPath: /usr/share/S3/html <4>


This is a path for web which should not be updated.

liangxia · 2018-08-06T03:04:49Z

release_notes/ocp_3_6_release_notes.adoc

    ports:
    - containerPort: 80
    volumeMounts:
    - name: workdir
-      mountPath: /usr/share/nginx/html
+      mountPath: /usr/share/S3/html


mburke5678 · 2018-08-06T21:42:33Z

/cherrypick enterprise-3.10

openshift-cherrypick-robot · 2018-08-06T21:42:42Z

@mburke5678: new pull request created: #11397

In response to this:

/cherrypick enterprise-3.10

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.

mburke5678 · 2018-08-06T21:49:33Z

/cherrypick enterprise-3.11

openshift-cherrypick-robot · 2018-08-06T21:49:39Z

@mburke5678: new pull request created: #11398

In response to this:

/cherrypick enterprise-3.11

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.

openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 3, 2018

sjenning reviewed Jul 5, 2018

View reviewed changes

mburke5678 added branch/enterprise-3.1 branch/enterprise-3.2 branch/enterprise-3.3 branch/enterprise-3.4 branch/enterprise-3.5 branch/enterprise-3.6 branch/enterprise-3.7 branch/enterprise-3.9 branch/enterprise-3.10 labels Jul 11, 2018

mburke5678 force-pushed the nginx-removal branch from ff75b33 to 83fcaa3 Compare July 13, 2018 21:58

vikram-redhat mentioned this pull request Aug 2, 2018

Don't use nginx image for the Pod example #1533

Closed

liangxia reviewed Aug 6, 2018

View reviewed changes

mburke5678 force-pushed the nginx-removal branch from a974400 to 59d5816 Compare August 6, 2018 13:27

openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 6, 2018

mburke5678 force-pushed the nginx-removal branch from f6f3855 to 53666cb Compare August 6, 2018 20:02

removed image:nginx per sjennings

2dfa3af

mburke5678 force-pushed the nginx-removal branch from 53666cb to 2dfa3af Compare August 6, 2018 20:03

openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 6, 2018

mburke5678 merged commit b22495c into openshift:master Aug 6, 2018

openshift-cherrypick-robot mentioned this pull request Aug 6, 2018

[enterprise-3.10] Don't use nginx image for the Pod example #11397

Merged

openshift deleted a comment from openshift-cherrypick-robot Aug 6, 2018

openshift-cherrypick-robot mentioned this pull request Aug 6, 2018

[enterprise-3.11] Don't use nginx image for the Pod example #11398

Merged

openshift deleted a comment from openshift-cherrypick-robot Aug 7, 2018

This was referenced Aug 7, 2018

[enterprise-3.4] Don't use nginx image for the Pod example #11415

Merged

[enterprise-3.6] Don't use nginx image for the Pod example #11408

Merged

[enterprise-3.5] Don't use nginx image for the Pod example #11409

Merged

pdecat mentioned this pull request Dec 7, 2018

Fix Deployment acceptance tests hashicorp/terraform-provider-kubernetes#248

Merged

mburke5678 deleted the nginx-removal branch December 18, 2018 15:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't use nginx image for the Pod example #10618

Don't use nginx image for the Pod example #10618

mburke5678 commented Jul 3, 2018 •

edited

Loading

sjenning Jul 5, 2018

sjenning Jul 5, 2018

sjenning Jul 5, 2018

mburke5678 Jul 11, 2018

liangxia Aug 1, 2018

mburke5678 Aug 1, 2018

mburke5678 Aug 3, 2018

liangxia Aug 6, 2018

mburke5678 commented Jul 11, 2018

mburke5678 commented Jul 11, 2018

sjenning commented Jul 13, 2018

mburke5678 commented Jul 19, 2018

mdshuai commented Aug 1, 2018

liangxia commented Aug 6, 2018

liangxia Aug 6, 2018

liangxia Aug 6, 2018

kalexand-rh Aug 6, 2018

liangxia Aug 6, 2018

liangxia Aug 6, 2018

liangxia Aug 6, 2018

liangxia Aug 6, 2018

mburke5678 commented Aug 6, 2018

openshift-cherrypick-robot commented Aug 6, 2018

mburke5678 commented Aug 6, 2018

openshift-cherrypick-robot commented Aug 6, 2018

Don't use nginx image for the Pod example #10618

Don't use nginx image for the Pod example #10618

Conversation

mburke5678 commented Jul 3, 2018 • 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

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

mburke5678 commented Jul 11, 2018

mburke5678 commented Jul 11, 2018

sjenning commented Jul 13, 2018

mburke5678 commented Jul 19, 2018

mdshuai commented Aug 1, 2018

liangxia commented Aug 6, 2018

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mburke5678 commented Aug 6, 2018

openshift-cherrypick-robot commented Aug 6, 2018

mburke5678 commented Aug 6, 2018

openshift-cherrypick-robot commented Aug 6, 2018

mburke5678 commented Jul 3, 2018 •

edited

Loading