k3s/test/kubemark/resources
Kubernetes Submit Queue 4f606b9c8d Merge pull request #42820 from MrHohn/addon-kubemark-v6.4-beta.1
Automatic merge from submit-queue (batch tested with PRs 42672, 42770, 42818, 42820, 40849)

kubemark test: Bump addon-manager to v6.4-beta.1

Follow up PR of #42760. This PR bumps addon-manager to v6.4-beta.1 for kubemark test.

**Release note**:

```release-note
NONE
```
2017-03-25 14:27:27 -07:00
..
manifests kubemark test: Bump addon-manager to v6.4-beta.1 2017-03-09 10:13:07 -08:00
heapster_template.json Bumped Heapster to v1.3.0 2017-03-17 15:45:52 +01:00
hollow-node_template.yaml Update npd to the official v0.3.0 release. 2017-03-15 14:26:12 -07:00
kernel-monitor.json Update npd in kubemark since #42201 is merged. 2017-03-02 16:29:24 -08:00
kubemark-ns.json
start-kubemark-master.sh Modified kubemark startup scripts to restore master on reboots 2017-02-28 19:51:00 +01:00