github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
79,503 Commits
32 Branches
881 Tags
632 MiB
Commit Graph

429 Commits (k3s-v1.15.3)

Author SHA1 Message Date
deads2k 11e8068d3f move pkg/fields to apimachinery 2017-01-19 09:50:16 -05:00
deads2k 8686d67c80 move pkg/util/rand 2017-01-16 16:04:03 -05:00
Jeff Grafton 1c2ea28080 Update images that use ubuntu-slim base image to :0.6 2017-01-11 15:07:04 -08:00
deads2k 6a4d5cd7cc start the apimachinery repo 2017-01-11 09:09:48 -05:00
Jeff Grafton 19aafd291c Always --pull in docker build to ensure recent base images 2017-01-10 16:21:05 -08:00
Jeff Grafton 20d221f75c Enable auto-generating sources rules 2017-01-05 14:14:13 -08:00
Kubernetes Submit Queue 274a9f0f70 Merge pull request #38927 from luxas/remove_maintainer 
Automatic merge from submit-queue

Remove all MAINTAINER statements in the codebase as they are deprecated

**What this PR does / why we need it**:
ref: https://github.com/docker/docker/pull/25466

**Release note**:

```release-note
Remove all MAINTAINER statements in Dockerfiles in the codebase as they are deprecated by docker
```
@ixdy @thockin (who else should be notified?)
 2016-12-29 16:41:24 -08:00
Mike Danese 161c391f44 autogenerated 2016-12-29 13:04:10 -08:00
Lucas Käldström 3c5b5f5963 Remove all MAINTAINER statements in the codebase as they aren't very useful and now deprecated 2016-12-17 20:34:10 +02:00
Mike Danese 82d9ed770c fix examples/ compilation so that test/ also compiles 
fix network-tester cauldron serve_hostnames
 2016-12-12 15:14:49 -08:00
Mike Danese c87de85347 autoupdate BUILD files 2016-12-12 13:30:07 -08:00
gajju26 70b92aab45 PR-2 Making docker images availabe for s390x on gcr.io repository and enables s390x support to kube-dns , pause, addon-manager, etcd, hyperkube, kube-discovery modules 2016-12-09 14:38:02 +05:30
Kubernetes Submit Queue ee55ea8e68 Merge pull request #37294 from jsafrane/gluster-on-tmpfs 
Automatic merge from submit-queue (batch tested with PRs 36626, 37294, 37463, 37943, 36541)

Use tmpfs for gluster-server container volumes.

Gluster server needs a filesystem that supports extended attributes for its data. Some distros (Debian, Ubuntu) ship Docker that runs containers on aufs, which does not support extended attributes and therefore Gluster server fails there.

We can use tmpfs for Gluster server data volumes. ~~This expects that host's /tmp is tmpfs, which is true for  Debian, Ubuntu, RHEL, CentOS and Fedora.~~

I reworked it to mount tmpfs inside the container, the server pod is privileged.

And *after* this PR is merged and new Gluster server container image is pushed we need to bump the image version in https://github.com/kubernetes/kubernetes/blob/master/test/e2e/volumes.go#L407

Edit: I also fixed Gluster server Dockerfile, it was not working at all.
 2016-12-08 00:23:10 -08:00
Jess Frazelle 4d27212149
fix golint errors on master for 1.6 
Signed-off-by: Jess Frazelle <acidburn@google.com>
 2016-12-05 15:01:33 -08:00
Dr. Stefan Schimanski 2bb7903a39 portfordwardtester: avoid data loss during send+close+exit 2016-11-29 09:42:14 +01:00
Jan Safranek 82d66c7d75 Use tmpfs for gluster-server container volumes. 
Gluster server needs a filesystem that supports extended attributes for its
data. Some distros (Debian, Ubuntu) ship Docker that runs containers on aufs,
which does not support extended attributes and therefore Gluster server fails
there.

We can use tmpfs for Gluster server data volumes instead of a directory inside
the container.
 2016-11-22 16:11:30 +01:00
Bowei Du d99accad41 Change dnsutils image to use alpine 
This reduces the size of the image considerably
 2016-11-14 13:50:51 -08:00
Bowei Du 938430b1eb Should not defer conn.Close when leaking the connection 2016-11-03 22:07:07 -07:00
Jing Xu ceb2de2939 Enable NFS volume test 
This PR fixes the dockerfile for NFS server image and enable NFSv4.
After using containeried mounts approach on GCI, this test should pass.
 2016-11-03 12:48:09 -07:00
Christian Koep cc1d8951a9
Fix typos and linted_packages sorting 2016-10-31 18:31:08 +01:00
Kubernetes Submit Queue 6343db835a Merge pull request #35454 from bowei/image-for-issue-32551 
Automatic merge from submit-queue

Add test image for networking related tests

This test image is to support the e2e test for #32551
 2016-10-30 01:56:10 -07:00
Kubernetes Submit Queue 6e767c71ed Merge pull request #35175 from rothgar/issue-33765 
Automatic merge from submit-queue

Fixed gcloud command in logs-generator makefile

I grepped through the code looking for `gcloud` and `push` commands and only found one Makefile missing the `--`. I added it.

fixes #33765 🐛
 2016-10-27 01:28:04 -07:00
Bowei Du efa3db9f78 Add test image for networking related tests 2016-10-25 13:34:03 -07:00
Kubernetes Submit Queue b5d604bcb0 Merge pull request #35302 from intelsdi-x/portforwarding_image_changes 
Automatic merge from submit-queue

test-images: server address is now configurable

This commit perform changes discussed in #32128
Should be merged before #35301

cc: @pskrzyns
 2016-10-25 13:24:07 -07:00
Mike Danese 56200d16a3 add genrule for test bindata 2016-10-24 18:00:08 -07:00
Mike Danese 763c4987f2 autogenerated 2016-10-24 14:47:27 -07:00
Jan Chaloupka 4fde09d308 Replace client with clientset in code 2016-10-23 22:00:35 +02:00
Michał Żyłowski 69a1b1dbbf test-images: server address is now configurable 2016-10-23 20:37:57 +02:00
Mike Danese 3b6a067afc autogenerated 2016-10-21 17:32:32 -07:00
Justin Garrison 746e66958d fixed gcloud command in logs-generator makefile 2016-10-19 23:05:47 -07:00
Kubernetes Submit Queue 40e1aa6b25 Merge pull request #34542 from Crassirostris/logs-generator 
Automatic merge from submit-queue

Add logs generator

@piosz 

Tool to test logging mechanisms, mentioned in #34310
 2016-10-17 03:32:31 -07:00
Mik Vyatskov 7ab1fc4600 Add logs generator 2016-10-16 16:38:36 +02:00
Jess Frazelle cde5559d09
Update `gcloud docker` commands to use `gcloud docker -- ARGS` 
We can then avoid the following warning:
```
WARNING: The '--' argument must be specified between gcloud specific args on the left and DOCKER_ARGS on the right. IMPORTANT: previously, commands allowed the omission of the --, and unparsed arguments were treated as implementation args. This usage is being deprecated and will be removed in March 2017.
This will be strictly enforced in March 2017. Use 'gcloud beta docker' to see new behavior.
```

Signed-off-by: Jess Frazelle <acidburn@google.com>
 2016-10-10 13:42:34 -07:00
bprashanth 1d7cdffebc Cleanup netexec image and usage. 2016-10-04 14:22:41 -07:00
Kubernetes Submit Queue 520cd7e6f3 Merge pull request #31241 from m1093782566/m109-cross-build-serve-hostname 
Automatic merge from submit-queue

Cross-build test/images/serve_hostname

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**:

**cross build** `test/images/serve_hostname`

https://github.com/kubernetes/kubernetes/tree/master/test/images/serve_hostname

This PR is an effort to achieve multiarch Kubernetes(#26863)

**Which issue this PR fixes** : 

fixes #31238 

@luxas @spxtr
 2016-09-12 05:57:46 -07:00
m1093782566 be889f892a address comments 2016-09-10 07:30:48 -04:00
m1093782566 ffc77eff71 cross build test/images/serve_hostname and update README 2016-09-02 17:25:03 -04:00
Avesh Agarwal 4ba39b4722 Update mounttest container image version to 0.7 everywhere. 2016-09-02 09:03:11 -04:00
Girish Kalele b82c028f77 GCE Cloud provider changes for ESIPP 
Add feature gate (ExternalTrafficLocalOnly) for alpha feature
 2016-08-23 16:16:39 -07:00
Matthew Wong a7145c013e Add test for supplemental gid annotation to pv e2e test 2016-08-09 18:23:06 -04:00
codejuan b038355c81 fixed regex error, which replace 2 line in template file 2016-08-04 22:13:45 +08:00
David McMahon ef0c9f0c5b Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
k8s-merge-robot abc06c9d73 Merge pull request #26913 from bprashanth/petset_e2e 
Automatic merge from submit-queue

Improve petset e2es

Mainly
* scale petset to 0 and wait for volume provisioner to delete pvs so we don't leak them
* bake binaries into init[0] and cp into destination, instead of wgetting at runtime
* dump verbose debug output on failure

https://github.com/kubernetes/test-infra/pull/115, https://github.com/kubernetes/kubernetes/issues/26824
 2016-06-09 23:31:36 -07:00
Prashanth Balasubramanian ff23a0e4fc Clarity and reliability fixes for petset e2es 2016-06-09 12:58:28 -07:00
Wojciech Tyczynski 12d1cc454c Change webserver binary to be usable in large clusters. 2016-06-09 16:01:01 +02:00
Jerzy Szczepkowski 967a7c95d2 Rework of resource consumer. 
Major rework of resource consumer: added controller running as a pod that spreads requests around consumers. This should fix #21664 and #23536.
 2016-06-01 15:50:03 +02:00
k8s-merge-robot 91977842ac Merge pull request #26330 from aledbf/test-iperf 
Automatic merge from submit-queue

Use ubuntu-slim to reduce size of the iperf:e2e image

from
```
gcr.io/google_containers/iperf     e2e      8b3cc7064090        5 weeks ago     737.9 MB
```
to
```
gcr.io/google_containers/iperf     e2e      204325491636        33 seconds ago  61.09 MB
```

related to https://github.com/kubernetes/kubernetes/pull/25784#issuecomment-221706886
ping @bprashanth
 2016-05-29 16:36:44 -07:00
Manuel de Brito Fontes fcea6e0e9e Use ubuntu-slim to reduce size of the iperf:e2e image 2016-05-25 22:50:57 -03:00
Colin Hom a092fd2dd4 Federation build and e2e test integration 
Federation components are now buildable and e2e-testable via e2e.go.
 2016-05-25 15:07:27 -07:00
Jan Chaloupka 0e0be8421f gcr.io/google_containers/mounttest: use Stat instead of Lstat to retrieve fileinfo of symlinks as well 2016-05-17 15:57:33 +02:00
Tim Hockin cbf886c7f4 Convert everything to use vendor/ 2016-05-08 20:30:37 -07:00
Robert Bailey 18a829e7a4 Merge pull request #24512 from freehan/goproxyflake 
reuse goproxy pod and avoid race between kubectl exec and goproxy readiness
 2016-05-06 14:46:30 -07:00
Humble Devassy Chirammal fbc22b39b9 Update Dockerfile 
Exposing 24008 is not required as glusterd listens on 24007 port.
 2016-04-29 19:46:30 +05:30
Minhan Xia 1993bf901a reuse goproxy pod and avoid race between kubectl exec and goproxy readiness 2016-04-26 16:45:10 -07:00
Erick Fejta 4e4edb4edc Add Makefile for iperf 2016-04-13 14:28:33 -07:00
k8s-merge-robot 8905e61522 Merge pull request #23872 from jayunit100/iperf-container 
Automatic merge from submit-queue

IPerf container to support network perfomance testing

Simple iperf container.

Issue:
We want to run iperf from the e2e tests for a network baseline, but there are no gcr images for this.

Solution:
Curate our own iperf container from source in kubernetes and copy it as a top level microservice.  So long as these are injected into GCR, we can then run this container from the e2e tests.

 cc @sig-testing this can be used along side #22869
 2016-04-13 02:18:40 -07:00
Huamin Chen 3a914c2583 fix #22529: disable nfsv4 and use nfsv3 2016-04-12 16:23:28 +00:00
jay vyas 0e35d9194c IPerf container to support network perfomance testing 2016-04-08 22:53:57 -04:00
goltermann 696423e044 Vet fixes, mostly pass lock by value errors. 2016-04-06 11:27:40 -07:00
Dawn Chen c47f74a470 Merge pull request #23348 from pwittrock/docs 
Update docs to reflect `kubectl run` creates deployments by default i…
 2016-03-28 17:03:47 -07:00
Phillip Wittrock 4d2f3c1c17 Update docs to reflect `kubectl run` creates deployments by default instead of replicatino controllers. 2016-03-28 16:25:02 -07:00
k8s-merge-robot 25d94e80e0 Merge pull request #23289 from pwittrock/move-serve-hostname 
Auto commit by PR queue bot
 2016-03-26 11:20:12 -07:00
goltermann 34d4eaea08 Fixing several (but not all) go vet errors. Most are around string formatting, or unreachable code. 2016-03-22 17:26:50 -07:00
Phillip Wittrock d1d6650efd Remove test tag from serve_hostname Makefile 2016-03-21 13:53:35 -07:00
deads2k ab03317d96 support CIDRs in NO_PROXY 2016-03-16 16:22:54 -04:00
k8s-merge-robot 49092c0b99 Merge pull request #22443 from pwittrock/move-serve-hostname 
Auto commit by PR queue bot
 2016-03-15 21:57:16 -07:00
k8s-merge-robot 3081c10a40 Merge pull request #22632 from jsafrane/devel/fix-nfs-image 
Auto commit by PR queue bot
 2016-03-09 12:51:44 -08:00
k8s-merge-robot 999e6311b5 Merge pull request #18672 from bprashanth/netexec 
Auto commit by PR queue bot
 2016-03-08 06:10:02 -08:00
Jan Safranek 44f995699e Fix NFS and gluster test containers taking 100% of CPU 2016-03-08 10:32:34 +01:00
k8s-merge-robot 61c9a004a5 Merge pull request #22397 from bprashanth/dns_debug 
Auto commit by PR queue bot
 2016-03-07 00:20:03 -08:00
Prashanth Balasubramanian 92ff05f2e6 Wait till netexec is Ready in kubeproxy e2e 2016-03-03 11:27:32 -08:00
Prashanth Balasubramanian 33bb8e863c Add a simple clusterapi-tester, improve e2e logging. 2016-03-03 10:01:01 -08:00
Phillip Wittrock b5bfc6c281 Move serve_hostname testing image to k8s test/images from contrib/for-demos 2016-03-03 09:22:43 -08:00
Minhan Xia 57fc5e1380 bump wait timeout for nettest container 2016-03-01 11:17:15 -08:00
Minhan Xia 66940c2d44 wait for all webserver endpoints to come up before contacting peers 2016-02-24 18:35:59 -08:00
Jeff Grafton 87b0783808 Update tests to use nettest:1.7 2016-02-11 15:50:53 -08:00
Jeff Grafton 214d018911 Fix deadlock in nettest webserver 2016-02-11 15:50:45 -08:00
k8s-merge-robot dbd7b83d93 Merge pull request #20545 from pmorie/boilerplate 
Auto commit by PR queue bot
 2016-02-03 19:46:26 -08:00
Paul Morie b672785d72 Add boilerplate checks for Dockerfiles 2016-02-03 18:35:26 -05:00
Paul Morie 05bd107301 Add boilerplate checks for Makefiles 2016-02-03 18:35:26 -05:00
Tim Hockin bb460c04dd netexec: Add / and /echo handlers, bump to 1.4 
Add some logs, allow simple "cmd" arg for shell.
 2016-02-02 21:46:30 -08:00
harry 845a3145cd Add a fake git server image for e2e test 2016-01-21 14:19:18 +08:00
Chao Xu 144b5acd08 move ServerVersion to DiscoveryClient 2016-01-13 10:11:52 -08:00
Piotr Szczesniak fe04005959 Merge pull request #18658 from jszczepkowski/rc-bump 
Autoscaling e2e tests: bumped resource consumer to version beta2.
 2015-12-15 09:05:11 +01:00
Jerzy Szczepkowski dd62c8e831 Autoscaling e2e tests: bumped resource consumer to version beta2. 
Autoscaling e2e tests: bumped resource consumer to version beta2.
 2015-12-14 16:55:26 +01:00
Jerzy Szczepkowski aade6e78b2 Added handling custom metrics to resource consumer. 
Added handling custom metrics in Prometheus format to resource consumer.
 2015-12-10 16:20:03 +01:00
k8s-merge-robot 1a57cc8033 Merge pull request #15777 from mesosphere/sttts-replace-ssh-by-net-host-container 
Auto commit by PR queue bot
 2015-11-20 02:19:25 -08:00
Dr. Stefan Schimanski 2d6c2eb897 e2e: replace ssh with net=host hostexec pod and kubectl exec 
- document needed packages in hostexec image
- add RunHostCmdOrDie
- kube-proxy e2e: port from ssh to hostexec
  - use preset NodeName to schedule test pods to different nodes
  - parallel launch of pods
  - port from ssh to hostexec
  - add timeout because nc might block on udp
  - delete test container without grace period
- PrivilegedPod e2e: port from ssh to hostexec
- NodePort e2e: port from ssh to hostexec
- cluster/mesos/docker: Enable privileged pods
 2015-11-17 20:48:34 +01:00
Salvatore Dario Minonne e2c315ee99 modifying readFileContentInLoop to display iteratively file content and eventually check initial content 2015-11-14 22:52:34 +01:00
Dr. Stefan Schimanski 862143fc62 Add hostexec test image 2015-11-11 22:48:56 +01:00
vollschwitz ac9484b869 prevent consumecpu/mem from becoming zombies by calling run instead of start 2015-11-10 08:04:26 +01:00
Prashanth Balasubramanian 84e9277bcc Test image 2015-11-02 12:35:27 -08:00
Steve Milner 70e4693428 Standardized test image Makefile targets 2015-10-29 10:12:05 -04:00
Zach Loafman b71bc4e480 Fix volumes/test/nfs: Needs to run insecure to allow container connections 
Since this is a container service port anyways, "insecure" is a bit of
a red herring. There's no real security relevance to the incoming port
numbers for the NFS server pod.

This lets us get rid of the examples/nfs/exporter Docker build
(@jsafrane's personal image).
 2015-10-27 16:58:04 -07:00
Jan Safranek e0e482e4c8 Move CephFS test container to test/images. 2015-10-22 15:20:20 +02:00
Paul Morie 2ff043e75f Add ownership inspection to mount tester image 2015-10-19 18:42:07 -04:00
k8s-merge-robot a3f2ba2e34 Merge pull request #11694 from ncdc/add-spdy-proxy-support 
Auto commit by PR queue bot
 2015-10-15 06:56:15 -07:00
Jordan Liggitt 826459e51e Allow specifying scheme when proxying 2015-10-12 11:16:53 -04:00
Filip Grzadkowski c0532a432a Revert "Allow specifying scheme when proxying" 2015-10-07 13:02:35 +02:00
Jordan Liggitt b9ba3bd7c2 Allow specifying scheme when proxying 2015-10-05 22:12:10 -04:00
Steve Milner e5d64ea19b e2e: kubectl verification for HTTP proxying using netexec and goproxy. 2015-10-05 16:05:36 -04:00
Steve Milner e5b85194aa netexec: Multiple fixes and enhancements to netexec 
* Added upload functionality
* More logging
* Moved to test/images
* Image file fixes
 2015-10-05 16:05:36 -04:00
Andy Goldstein 9f1bd07322 Add goproxy test image 2015-10-05 16:05:34 -04:00
k8s-merge-robot ffacd3bcf2 Merge pull request #14645 from socaa/readme 
Auto commit by PR queue bot
 2015-10-02 18:48:22 -07:00
k8s-merge-robot cd5cb5791e Merge pull request #14837 from liggitt/nettest_tls 
Auto commit by PR queue bot
 2015-10-02 14:29:59 -07:00
Jordan Liggitt 1d1d7bb145 Add https to porter test image 2015-10-01 22:55:58 -04:00
Ewa Socala ce5d7d43db added README file to Resource Consumer 2015-10-01 10:28:48 +02:00
Andy Goldstein 7f900daa3e Add port-forward-tester image 2015-09-30 20:03:49 -04:00
Tamer Tas cb5f921df1 Add newline to the end of bash scripts 2015-09-18 19:35:05 +03:00
Piotr Szczesniak 66759a4e24 Bumped image tag for Resource Consumer 2015-09-15 16:10:58 +02:00
k8s-merge-robot db128ac0f7 Merge pull request #13736 from socaa/dockerfile-memory 
Auto commit by PR queue bot
 2015-09-14 16:35:52 -07:00
tummychow 78ce5da988 Move util.StringSet into its own package 
A lot of packages use StringSet, but they don't use anything else from
the util package. Moving StringSet into another package will shrink
their dependency trees significantly.
 2015-09-10 12:04:15 -07:00
k8s-merge-robot 08fbe2bc10 Merge pull request #13789 from socaa/resource-consumer-memory 
Auto commit by PR queue bot
 2015-09-10 08:49:42 -07:00
Ewa Socala 9e640b356c Memory consumption added to Resource Consumer 2015-09-10 13:50:49 +02:00
Ewa Socala 569ebf7a9b Resource Consumer Handler milicore changed to millicore 2015-09-10 12:17:02 +02:00
Ewa Socala 44e1d55029 added possibility of memory consumption to Dockerfile 2015-09-09 16:09:17 +02:00
derekwaynecarr b05c11edac Fix typo for milicores to millicores 2015-09-08 14:12:08 -04:00
Jan Safranek bcdf89a909 Rebase the gluster image to CentOS. 
Using the same base for NFS and Gluster images should reduce the download size.
Also, CentOS image is ~30MB smaller than Ubuntu 14.04.
 2015-08-28 12:26:01 +02:00
Jan Safranek 49921ada74 Configure lower NFS grace period. 
From RFC 3530:
  During the grace period, the server must reject READ and WRITE operations
  and non-reclaim locking requests (i.e., other LOCK and OPEN operations)
  with an error of NFS4ERR_GRACE.

That basically means that all open() calls from clients are blocked until the
grace period is over (90 seconds by default).

We want the grace period as low as possible to speed up the tests. '10'
seconds were tested on Fedora 21 and Ubuntu 15.04 as the hosts.

The test image is rebased to Fedora in order to get 'rpc.nfsd -G <n>' option,
Ubuntu does not support it.
 2015-08-27 17:50:05 +02:00
Ewa Socala c68508f8cf Changed Resource Consumer for correct parsing POST requests 2015-08-25 16:29:29 +02:00
Zach Loafman 0a8291505a Merge pull request #9234 from ZJU-SEL/fix-e2e-test-hostdir 
fix e2e hostdir test
 2015-08-21 15:51:42 -07:00
Clayton Coleman 9ee7b76bba Allow testing graceful shutdown via network-tester 2015-08-19 22:06:37 -04:00
He Simei faeb45d69f fix host dir, to test volume r/w with different containers within a pod 
Signed-off-by: He Simei <hesimei@zju.edu.cn>
 2015-08-20 08:55:19 +08:00
Paul Morie cffacbb5bd Fix FROM clause in mount-test-user image 2015-08-19 13:49:30 -04:00
Robert Bailey 08e6a43c1d Revert "Merge pull request #9165 from smarterclayton/graceful" 
This reverts commit 4f856b595d, reversing
changes made to d78525a83b.

Conflicts:
	pkg/kubelet/status_manager.go
 2015-08-18 17:34:49 -07:00
Kris Rousey ae6c64d9bb Moving everyone to unversioned client 2015-08-18 10:23:03 -07:00
Clayton Coleman 266e6226e5 Move slow-* items to test/images/network-tester 2015-08-18 09:08:46 -04:00
Clayton Coleman b842a7dd15 Revert "Revert "Gracefully delete pods from the Kubelet"" 
This reverts commit 98115facfd.
 2015-08-18 08:57:02 -04:00
Mike Danese fa40ced8f8 move contrib/for-tests to test/images 2015-08-14 20:42:46 -07:00