Skip to content

Commit

Permalink
Clarifies some of the instructions and properly links to versions tha…
Browse files Browse the repository at this point in the history
…t are tracking.

Signed-off-by: Timothy St. Clair <[email protected]>
  • Loading branch information
timothysc committed Oct 27, 2017
1 parent 0f79c17 commit bb9f069
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 22 deletions.
2 changes: 1 addition & 1 deletion instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ suite.

The standard tool for running these tests is
[sonobuoy](https://github.com/heptio/sonobuoy), and the standard way to run
these in your cluster is with `curl -L https://raw.githubusercontent.com/cncf/k8s-conformance/master/sonobuoy-conformance-1.7.yaml | kubectl apply -f -`.
these in your cluster is with `curl -L https://raw.githubusercontent.com/cncf/k8s-conformance/master/sonobuoy-conformance.yaml | kubectl apply -f -`.

Watch sonobuoy's logs with `kubectl logs -f -n sonobuoy sonobuoy` and wait for
the line `no-exit was specified, sonobuoy is now blocking`. At this point, use
Expand Down
15 changes: 2 additions & 13 deletions issues.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
# Issue Tracking Doc
# Issue Tracking

This document tracks issues with the conformance e2e suite and their resolutions.

## e2e: Internet connection test should not rely on ICMP achievement

* https://github.com/kubernetes/kubernetes/issues/51145
* https://github.com/kubernetes/kubernetes/pull/51287
* https://github.com/kubernetes/kubernetes/pull/53381

## ThirdParty resource e2e test should not be marked as conformance

* https://github.com/kubernetes/kubernetes/issues/52822
* https://github.com/kubernetes/kubernetes/pull/52823
For issues that occur with the e2e test please cross reference the [tracking issue.](https://github.com/cncf/k8s-conformance/issues/27)
2 changes: 1 addition & 1 deletion reviewing.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# How to review conformance results

1. Make sure the list of files matches [the one specified here](https://github.com/cncf/k8s-conformance/blob/master/instructions.md#contents-of-the-pr)
2. Look at `version.txt`. Make sure the `client` and `server` versions match each other to the minor version level. Make sure this also matches the `vX.Y` subdirectory that the PR is in.
2. Look at `version.txt`. Make sure the `client` version is no more than one minor version greater than the `server` version
3. Verify that the last line of `e2e.log` says "SUCCESS! -- `N` Passed | 0 Failed | 0 Pending | `M` Skipped PASS". The exact value of `N` and `M` don't matter as long as we see `0 Failed | 0 Pending`.
14 changes: 7 additions & 7 deletions sonobuoy-conformance-1.7.yaml → sonobuoy-conformance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ metadata:
data:
config.json: |
{
"Description": "EXAMPLE",
"Description": "CNCF v1.7 or v1.8 Conformance Results",
"Filters": {
"LabelSelector": "",
"Namespaces": ".*"
Expand All @@ -70,9 +70,9 @@ data:
"advertiseaddress": "sonobuoy-master:8080",
"bindaddress": "0.0.0.0",
"bindport": 8080,
"timeoutseconds": 3600
"timeoutseconds": 5400
},
"Version": "v0.8.0"
"Version": "v0.9.0"
}
---
apiVersion: v1
Expand All @@ -92,7 +92,7 @@ data:
- env:
- name: E2E_FOCUS
value: '\[Conformance\]'
image: gcr.io/heptio-images/kube-conformance:v1.7.3
image: gcr.io/heptio-images/kube-conformance:v1.8
imagePullPolicy: Always
name: e2e
volumeMounts:
Expand All @@ -110,7 +110,7 @@ data:
fieldPath: spec.nodeName
- name: RESULTS_DIR
value: /tmp/results
image: gcr.io/heptio-images/sonobuoy:latest
image: gcr.io/heptio-images/sonobuoy:v0.9.0
imagePullPolicy: Always
name: sonobuoy-worker
volumeMounts:
Expand Down Expand Up @@ -153,13 +153,13 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
image: gcr.io/heptio-images/sonobuoy:latest
image: gcr.io/heptio-images/sonobuoy:v0.9.0
imagePullPolicy: Always
name: kube-sonobuoy
volumeMounts:
- mountPath: /etc/sonobuoy
name: sonobuoy-config-volume
- mountPath: /etc/sonobuoy/plugins.d
- mountPath: /plugins.d
name: sonobuoy-plugins-volume
- mountPath: /tmp/sonobuoy
name: output-volume
Expand Down

0 comments on commit bb9f069

Please sign in to comment.