Resolving bad merge with cherry-pick (#964)

docs/serving/samples/traffic-splitting/updated_configuration.yaml → docs/serving/samples/hello-world/rest-api-go/sample-template.yaml

@@ -11,27 +11,24 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 apiVersion: serving.knative.dev/v1alpha1
-kind: Configuration
+kind: Service
 metadata:
-  name: stock-configuration-example
+  name: stock-service-example
   namespace: default
 spec:
-  revisionTemplate:
-    metadata:
-      labels:
-        knative.dev/type: container
-    spec:
-      container:
-        # This is the Go import path for the binary to containerize
-        # and substitute here.
-        image: github.com/knative/docs/docs/serving/samples/rest-api-go
-        env:
-          - name: RESOURCE
-            value: share
-        readinessProbe:
-          httpGet:
-            path: /
-          initialDelaySeconds: 3
-          periodSeconds: 3
+  runLatest:
+    configuration:
+      revisionTemplate:
+        spec:
+          container:
+            image: ${REPO}/rest-api-go
+            env:
+              - name: RESOURCE
+                value: stock
+            readinessProbe:
+              httpGet:
+                path: /
+              initialDelaySeconds: 0
+              periodSeconds: 3
+

docs/serving/samples/hello-world/traffic-splitting/release_sample.yaml

@@ -0,0 +1,35 @@
+# Copyright 2019 The Knative Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: serving.knative.dev/v1alpha1
+kind: Service
+metadata:
+  name: stock-service-example
+  namespace: default
+spec:
+ release:
+  revisions: ["${CURRENT}"]
+  configuration:
+    revisionTemplate:
+      spec:
+        container:
+          image: ${REPO}/rest-api-go
+          env:
+            - name: RESOURCE
+              value: stock
+          readinessProbe:
+            httpGet:
+              path: /
+            initialDelaySeconds: 0
+            periodSeconds: 3

docs/serving/samples/hello-world/traffic-splitting/split_sample.yaml

@@ -0,0 +1,36 @@
+# Copyright 2019 The Knative Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: serving.knative.dev/v1alpha1
+kind: Service
+metadata:
+  name: stock-service-example
+  namespace: default
+spec:
+ release:
+  revisions: [ "${CURRENT}", "${CANDIDATE}"]
+  rolloutPercent: 50
+  configuration:
+    revisionTemplate:
+      spec:
+        container:
+          image: ${REPO}/rest-api-go
+          env:
+            - name: RESOURCE
+              value: share
+          readinessProbe:
+            httpGet:
+              path: /
+            initialDelaySeconds: 0
+            periodSeconds: 3

docs/serving/samples/hello-world/traffic-splitting/updated_sample.yaml

@@ -0,0 +1,35 @@
+# Copyright 2019 The Knative Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: serving.knative.dev/v1alpha1
+kind: Service
+metadata:
+  name: stock-service-example
+  namespace: default
+spec:
+ release:
+  revisions: ["${CURRENT}"]
+  configuration:
+    revisionTemplate:
+      spec:
+        container:
+          image: ${REPO}/rest-api-go
+          env:
+            - name: RESOURCE
+              value: share
+          readinessProbe:
+            httpGet:
+              path: /
+            initialDelaySeconds: 0
+            periodSeconds: 3

docs/serving/samples/rest-api-go/README.md

@@ -174,9 +174,9 @@ echo $INGRESS_IP
 #### Minikube
 
 1. If your cluster is running outside a cloud provider (for example on
-   Minikube), your services will never get an external IP address, and your
-   INGRESS_IP will be empty. In that case, use the istio `hostIP` and `nodePort`
-   as the ingress IP:
+   Minikube), your services will never get an external IP address, and
+   `INGRESS_IP` won't contain a value. In that case, use the Istio `hostIP`
+   and `nodePort` as the ingress IP:
 
 ```shell
 export INGRESS_IP=$(kubectl get po --selector $INGRESSGATEWAY_LABEL=ingressgateway --namespace istio-system \