b0f685c072
Move all preloading code into preload package
2020-02-20 14:43:24 -08:00
7fddd05bf5
Merge pull request #6630 from medyagh/mount_kic
...
add mount feature to kic drivers
2020-02-20 14:11:15 -08:00
19fa296625
Compress with lz4
2020-02-20 14:07:03 -08:00
a2be045f16
remove debugging
2020-02-20 14:01:04 -08:00
c85fe4955d
Add integration tests for node labels
2020-02-20 13:57:09 -08:00
b62c12b7f2
label minikube nodes
2020-02-20 12:09:58 -08:00
38437b2fa4
Set timeout to an outrageous 8s, based on the bug
2020-02-20 11:16:58 -08:00
0e88697f16
Delete container once it has finished executing
2020-02-20 10:06:15 -08:00
055e4bb618
Add run to docker command
2020-02-20 09:57:19 -08:00
335637f4a3
Name tarball by k8s version name
2020-02-20 09:42:04 -08:00
b8bc461157
Rebased on master
2020-02-20 09:18:12 -08:00
96d992c8ca
Increase detection timeout from 2s to 4s for hyperV
2020-02-20 17:24:51 +09:00
30a38e5a9d
wrap error
2020-02-20 00:07:36 -08:00
4fe9ca5f05
break done delete and prune into two funcs better error handling
2020-02-20 00:07:36 -08:00
e1ffa5fb0f
return error instead of logging
2020-02-20 00:07:36 -08:00
354ff6256d
improve comments
2020-02-20 00:07:36 -08:00
6c94880149
dont list empty ones
2020-02-20 00:07:36 -08:00
d84aa9f447
lint
2020-02-20 00:07:36 -08:00
b1d139c24b
code review comments
2020-02-20 00:07:35 -08:00
efd4aabde4
clean up containers first then delete volume
2020-02-20 00:07:35 -08:00
b235255196
fix volume clean up
2020-02-20 00:07:35 -08:00
8700f8a1e0
Merge pull request #6700 from medyagh/resource_limit
...
fix inverted logic for resource logic
2020-02-19 23:57:16 -08:00
bb11bc666b
Create volume of preloaded images and mount it in
2020-02-19 23:02:36 -08:00
0af5734bc9
Merge pull request #6696 from priyawadhwa/install-addons
...
Fix bug in --install-addons flag
2020-02-19 22:33:50 -08:00
597798395f
lint
2020-02-19 22:01:45 -08:00
3a7041c3b2
add logging
2020-02-19 22:01:45 -08:00
d548eabdc6
added kic mount
2020-02-19 22:01:45 -08:00
ef0765609b
remove duplicate code
2020-02-19 22:01:45 -08:00
1ee08c7517
add funcs to get routable host ip from inside container
2020-02-19 22:01:45 -08:00
d506aa18b4
Download preloaded images tarball with --download-only flag
2020-02-19 21:53:44 -08:00
ec7c6ba4fa
fix inverted logic
2020-02-19 21:33:24 -08:00
5ad4d6ebf5
Fix bug in --install-addons flag
...
Respect --install-addons flag, don't install anything if it is false
2020-02-19 14:56:09 -08:00
98294b5ec1
Merge pull request #6693 from tstromberg/mount-try
...
Explicitly set TCP as the default 9p transmission method
2020-02-19 14:41:45 -08:00
58eaa66825
Explicitly set TCP as the default 9p transmission method
2020-02-19 12:56:00 -08:00
14af1fc14a
Merge pull request #6573 from wmuizelaar/bump-gvisor
...
Update gvisor runsc version
2020-02-19 11:50:54 -08:00
f08f325d83
Merge pull request #6602 from tstromberg/v1.17.3
...
Bump default Kubernetes version to v1.17.3
2020-02-19 09:08:21 -08:00
be1b471dea
Address lint error
2020-02-18 10:16:01 -08:00
a720355627
Merge branch 'sha256-checksum' of github.com:tstromberg/minikube into sha256-checksum
2020-02-18 08:32:12 -08:00
b201d4b5c9
Add glog logging
2020-02-18 13:29:56 -03:00
52c200a6cf
Merge pull request #6635 from medyagh/kic_volume
...
improve delete by labeling created docker volumes
2020-02-17 19:01:53 -08:00
1da0a370ff
code review comments
2020-02-17 10:55:53 -08:00
2bfcb72b96
Remove not used code
2020-02-17 10:22:11 -03:00
8691127c0a
See if newer gvisor fixes the kvm build
2020-02-17 13:20:40 +01:00
6077aa0146
Update gvisor runsc version
2020-02-17 13:20:40 +01:00
3ce0164281
add logging for prune
2020-02-16 11:54:56 -08:00
625900e362
Merge pull request #6605 from tstromberg/copy-confusion
...
sync: Fix path confusion and directory creation bugs
2020-02-15 00:46:53 -07:00
b0d19e51b5
Refactor kic ssh tunnel
2020-02-14 21:01:32 -03:00
08b0b654a0
Refactor PatchServicesIP
2020-02-14 13:01:43 -03:00
073558e21e
Add cleanup to kic tunnel
2020-02-14 12:43:26 -03:00
a007c0790c
Delete volumes created by kic
2020-02-14 01:39:16 -08:00
a4ee4186bd
create docker volumes explictily with a label
2020-02-14 01:01:53 -08:00
f74c956701
Merge pull request #6625 from priyawadhwa/fail-fast
...
Fail fast if waiting for SSH to be available
2020-02-14 00:09:35 -07:00
ccec3babb0
Merge conflict
2020-02-13 16:54:25 -08:00
9b1d2da478
Return an entire options struct
2020-02-13 16:50:53 -08:00
59abf60d7e
reinsert comment
2020-02-13 16:30:38 -08:00
01039b2020
rebased on master
2020-02-13 16:20:24 -08:00
ba9463d933
Stopped and running machines should count as existing
2020-02-13 16:15:00 -08:00
250e00564b
Select the checksum algorithm based on Kubernetes version
2020-02-13 14:57:03 -08:00
6d8a112abe
don\'t return that the machine doesn\'t exist if the k8s is stopped
2020-02-13 14:20:58 -08:00
8fc787bc20
Fail fast if waiting for SSH to be available
...
Integration tests were running long because we'd wait up to 22 minutes for SSH to succeed while creating the host. This commit introduces a two minute timer on creating the host. On my Macbook Pro with the docker driver, creating the host takes 5 seconds, so 2 minutes should be more than enough time.
Refer to #6608
2020-02-13 14:06:33 -08:00
8c2115b292
Bump constants back to v1.17.3
2020-02-13 12:39:40 -08:00
8a58274441
Merge conflict
2020-02-13 12:39:21 -08:00
2ee5c20a1d
Merge branch 'master' into sha256-checksum
2020-02-13 11:56:08 -08:00
19695856ee
Skip mkdir if there is no work to be done
2020-02-13 11:47:19 -08:00
c1a3e4348d
fix unit tests and fix merge conflicts
2020-02-13 10:30:12 -08:00
2785d292f5
Merge branch 'master' of github.com:kubernetes/minikube into node-pkg
2020-02-13 10:15:04 -08:00
4c6b435f68
revert docker volume host path ( #6616 )
2020-02-13 10:57:23 -07:00
3f0fceb769
Add patch services
2020-02-13 11:36:25 -03:00
b911e8f038
Bump go-containerregistry to latest ( #6073 )
...
* Bump go-containerregistry to latest
Signed-off-by: sayboras <sayboras@yahoo.com>
* Fix integration for cache image
2020-02-13 02:20:32 -07:00
8c55c9ca60
holy crap cyclical import hell sucks
2020-02-12 18:34:44 -08:00
f528df1f9a
Quote the node name to avoid YAML interpretation ( #6606 )
2020-02-12 19:15:23 -07:00
398c7ef00b
Add podman driver ( #6515 )
2020-02-12 19:11:44 -07:00
c25b03cf13
Update test data
2020-02-12 15:36:04 -08:00
1f346e43e8
Remove unnecessary range arg
2020-02-12 15:20:58 -08:00
52eec8cf77
Add more tests
2020-02-12 15:12:02 -08:00
2313b72a7d
sync: Fix path confusion and directory creation bugs
2020-02-12 14:26:38 -08:00
bf6f8bc708
Use SHA256 for Kubernetes release checksums
2020-02-12 13:31:17 -08:00
71c072ae02
Bump default Kubernetes version to v1.17.3
2020-02-12 13:29:33 -08:00
af353314e0
Separate cached kubernetes binaries by OS on host machine ( #6586 )
...
* Separate cached kubernetes binaries by OS on host machine
This way, all kubernetes binaries stored in ~/.minikube/cache/linux will be copied over to the VM and used for `minikube kubectl` on linux machines. kubectl will be stored in `~/.minikube/cache/{windows or darwin}` on windows/darwin so that `minikube kubectl` still works.
* Review comment
* Update integration test
* Make sure --download-only includes OS specific kubectl
Update integration test to make sure we download
OS specific kubectl on darwin/windows when using --download-only flag
2020-02-11 23:23:37 -07:00
b427dc5663
fixed commands, they mostly work now
2020-02-11 21:11:22 -08:00
9830d91c09
linting nonsense
2020-02-11 18:39:59 -08:00
adc1a56903
search and replace cleanup
2020-02-11 17:11:23 -08:00
744efaa330
REFACTOR COMPLETE?
2020-02-11 17:06:59 -08:00
b6a429dc9d
hey did you want more files? good
2020-02-11 15:45:49 -08:00
f2ebbb9c67
Merge branch 'master' of github.com:kubernetes/minikube into node-pkg
2020-02-11 09:44:10 -08:00
69aa54ff82
begin start refactor
2020-02-11 09:38:15 -08:00
ff763db1e7
Add podman-env for connecting with podman-remote ( #6351 )
...
* Refactor: add the docker vars after the shell vars
* Move shell handling functions to separate package
* Rename env source file to docker-env like command
* Add podman-env for connecting with podman-remote
* Remove leading Shell prefix from the shell package
* Add some documentation describing podman service
* Address some podman-env issues pointed out by lint
2020-02-10 22:59:37 -07:00
96c33046be
TestCacheBinariesForBootstrapper in a temp dir ( #6566 )
...
I was wondering why I had "invalid version" in my cache dir.
The downloads should probably be mocked, would be faster too ?
2020-02-10 11:41:20 -07:00
e18e4d083b
Fix `minikube start` in order to be able to start VM even if machine does not exist ( #5730 )
...
* fix startHost in order to be able to start VM even if machine does not exist
* Update func StartHost() and its unit test no to use config.GetMachineName()
* Add handle case when the kic image isn't pulled
2020-02-10 11:37:30 -07:00
239be7ed94
Create Hyper-V External Switch ( #6264 )
...
* Create and manager Hyper-V switch
* Adds new flag for Hyper-V driver
* Move switch creation out of chooseSwitch
Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>
2020-02-07 21:22:19 -07:00
e1fc3ce734
let's rearrange some stuff
2020-02-07 17:00:24 -08:00
26c01be29d
Merge pull request #6549 from afbjorklund/cruntime-format
...
Fix usage of quotes in cruntime format strings
2020-02-07 15:15:45 -08:00
b0608d6c75
Merge pull request #6545 from tstromberg/none-certs
...
Add ca-certificates directory for distros that do not include it
2020-02-07 14:37:48 -08:00
db1cdc42cf
Fix usage of quotes in cruntime format strings
...
And add a missing test for ImageExists function
2020-02-07 22:34:32 +01:00
97f926eeb1
Use vmpath constants where possible
2020-02-07 13:06:00 -08:00
7ff41cfb7b
Combine apiserver options with extraArgs
2020-02-07 10:53:57 -08:00
f03641f053
Merge branch 'master' into none-certs
2020-02-07 09:36:32 -08:00
4c285f55e4
Add ca-certificates directory for distros that do not include it
2020-02-07 09:35:36 -08:00
10ef863f7d
Merge pull request #6527 from tstromberg/powershell-env
...
Bug-compatible refactor of docker-env + output tests
2020-02-06 21:57:25 -08:00
9b7573ee20
Merge pull request #6514 from priyawadhwa/rm-pull-images-kubeadm
...
Remove kubeadm pull images
2020-02-06 17:11:50 -08:00
32bc0ff76a
Refactor docker-env for testability
2020-02-06 15:32:00 -08:00
60c8cfb03c
Merge branch 'master' of github.com:kubernetes/minikube into node-pkg
2020-02-06 13:39:07 -08:00
0b8fc8a1f6
fix v1.19 tests files
2020-02-05 21:52:07 -05:00
0a1eed5d10
fix v1.18 tests files
2020-02-05 21:51:57 -05:00
d37172f476
add more versions to test
2020-02-05 21:51:04 -05:00
eded9a17e1
Merge branch 'master' of github.com:kubernetes/minikube into node-pkg
2020-02-05 17:39:54 -08:00
8d365fcb03
shuffling stuff around for import purposes
2020-02-05 17:39:47 -08:00
091db5ddb6
Remove kubeadm pull images
2020-02-05 16:23:19 -08:00
950fc79544
Merge pull request #6512 from tstromberg/gvisor-fixes
...
gvisor fixes for v1.7.0
2020-02-05 15:37:05 -08:00
4e9e37b3b5
Merge pull request #6508 from tstromberg/mkdir-p
...
Create directory using os.MkDirAll, as mkdir -p does not work on windows
2020-02-05 14:53:29 -08:00
77f74d82d7
Remove unused files var
2020-02-05 14:53:02 -08:00
88c51d7971
Merge pull request #6509 from tstromberg/faster-health
...
Remove pod list stability double check
2020-02-05 14:50:07 -08:00
852d6176bc
Merge pull request #6472 from vijaykatam/service_cidr_cluster_dns_fix
...
Use cluster-dns IP setup by kubeadm
2020-02-05 14:46:12 -08:00
d66bcad56c
Only run kubectl apply on YAML files
2020-02-05 14:41:05 -08:00
0feb68c350
Add /tmp/gvisor to list of required paths
2020-02-05 14:40:54 -08:00
2ecc120b2b
Merge pull request #6503 from tstromberg/faster-dryrun
...
Skip driver autodetection if driver is already set
2020-02-05 13:48:42 -08:00
88693f295f
Merge pull request #6156 from nanikjava/f-fix-5144
...
Customizing host path for dynamically provisioned PersistentVolumes
2020-02-05 13:02:10 -08:00
2ba6c111bb
Remove extra log statements
2020-02-05 12:55:24 -08:00
8631246e76
Create directory using os.MkDirAll, as mkdir -p does not work on windows
2020-02-05 12:37:19 -08:00
a0dc0756d7
goimports
2020-02-05 12:06:18 -08:00
7c301ec27b
Merge branch 'master' into faster-dryrun
2020-02-05 12:05:43 -08:00
cd83165aab
Fix lint error in start.go
2020-02-05 11:39:30 -08:00
649d5c0f3f
refactor createSSHTunnel
2020-02-05 16:36:54 -03:00
089a6c2cf3
Merge pull request #6150 from alonyb/update-kubeadm-v1beta2
...
Update kubeadm api version from v1beta1 to v1beta2
2020-02-05 11:34:00 -08:00
0d29a2ac7b
Merge branch 'master' into f-fix-5144
2020-02-05 11:32:32 -08:00
6d59d9d7df
Merge pull request #6200 from laozc/node-name
...
Use profile name as cluster/node name
2020-02-05 11:27:35 -08:00
70c0e35c44
Refactor sshTunnelName
2020-02-05 16:24:23 -03:00
7f371d6374
Remove stability requirement to save 1s of startup time
2020-02-05 10:57:04 -08:00
80c0183f3d
Skip driver autodetect if driver is already set
2020-02-05 10:48:04 -08:00
cf8e247ae3
Use cluster-dns IP setup by kubeadm
...
Removed hardcoded `cluster-dns` IP 10.96.0.10, this allows kubelet to use `clusterDNS` configured by kubeadm in `/var/lib/kubelet/config.yaml`
Tested by starting minikube with `--service-cluster-ip-range=100.64.0.0/13` and verifying DNS resolution works.
/etc/systemd/system/kubelet.service.d/10-kubeadm.conf
```
[Unit]
Wants=docker.socket
[Service]
ExecStart=
ExecStart=/var/lib/minikube/binaries/v1.17.0/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver='cgroupfs' --client-ca-file=/v
ar/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/e
tc/kubernetes/kubelet.conf --node-ip=192.168.64.7 --pod-manifest-path=/etc/kubernetes/manifests
[Install]
```
DNS resolution test
```
kubectl run -i --tty --rm busybox --image=busybox --restart=Never -- sh
If you don't see a command prompt, try pressing enter.
/ # nslookup kubernetes.io
Server: 100.64.0.10
Address: 100.64.0.10:53
Non-authoritative answer:
Name: kubernetes.io
Address: 147.75.40.148
```
Fixes: https://github.com/kubernetes/minikube/issues/5727
fix lint errors
2020-02-05 10:28:16 -08:00
e0bccd044c
Add uniq tunnel name - kic tunnel
2020-02-05 14:22:15 -03:00
60c6116f2c
Extract sshTunnel - kic tunnel
2020-02-05 13:58:38 -03:00
5795b7f312
Merge branch 'master' into obvious_denv
2020-02-05 08:14:56 -08:00
0dfa069fd1
add support to multiple services - kic tunnel
2020-02-05 12:45:18 -03:00
c9ec946b64
Merge pull request #6494 from tstromberg/filesync
...
Fix local assets sync broken by addons refactor
2020-02-04 21:40:54 -08:00
0bd4099cfc
Merge pull request #5678 from priyawadhwa/compare
...
[mkcmp] add code to time `minikube start` for each binary
2020-02-04 20:49:59 -08:00
478502a217
Skip ahead if we are running on bare metal
2020-02-04 20:16:40 -08:00
8a7d8dc715
Add debugging log statements to cluster startup
2020-02-04 18:59:00 -08:00
dc0be4aed6
Merge branch 'master' of github.com:kubernetes/minikube into node-pkg
2020-02-04 17:29:31 -08:00
435010a3fc
pass profilename for testability
2020-02-04 16:35:51 -08:00
eda1c76fe5
add kic tunnel (alpha)
2020-02-04 21:33:56 -03:00
4b9d15a34c
point to host docker
2020-02-04 16:09:43 -08:00
6c13146987
revert some changes
2020-02-04 15:48:20 -08:00
c86b20ade2
add option to exec runner to point to host docker daemon
2020-02-04 15:33:04 -08:00
4f78a3ce88
Use driver.IsMock
2020-02-04 15:28:09 -08:00
93bc050ec3
Merge branch 'master' into filesync
2020-02-04 15:27:25 -08:00
6189e9e6f7
Add unit tests back
2020-02-04 15:20:13 -08:00
6f6663ec77
Make filesync unit tests excellent again
2020-02-04 15:06:43 -08:00
f41a10a98f
Fix up some unit tests
2020-02-04 15:01:40 -08:00
f6c7048392
use constants instead of hardcode
2020-02-04 13:30:23 -08:00
3937bae269
add new env var for docker-env command
2020-02-04 13:25:22 -08:00
3db7713399
Remove more functions from the util package
2020-02-04 13:20:37 -08:00
aea610b510
Add file sync support back to minikube
2020-02-04 13:19:17 -08:00
d35c825a05
Split cluster package into multiple files ( #6484 )
...
* Split cluster package into multiple files
* Name restart/ressurect functions fix
* Minor refactor fixes
2020-02-04 11:25:33 -07:00
42ec2c8d6c
Minor refactor fixes
2020-02-04 07:45:09 -08:00
9ca944934b
Merge
2020-02-04 07:44:47 -08:00
bb539cb05e
Merge branch 'filesync' of github.com:tstromberg/minikube into filesync
2020-02-04 07:24:40 -08:00
35c572dd07
fixHost refactoring
2020-02-04 07:22:01 -08:00
62f65662d4
Merge pull request #6471 from tstromberg/addons-startup2
...
Fix bugs that prevented previously-enabled addons from starting up
2020-02-04 06:58:13 -08:00
6c95a28c10
remove default crictl setting
2020-02-03 23:25:55 -08:00
98dbe06758
remove debugging messages
2020-02-03 22:39:12 -08:00
e231e7ae96
rever dockefile changes
2020-02-03 22:32:08 -08:00
92eeb3c10b
refactor provision
2020-02-03 22:29:27 -08:00
a2f2df9f81
add options to docker service for kic
2020-02-03 20:21:41 -08:00
4f6deaf5dc
Rebased on master
2020-02-03 16:31:11 -08:00
286396344c
Name restart/ressurect functions fix
2020-02-03 16:24:36 -08:00
16fd9beea3
Split cluster package into multiple files
2020-02-03 16:19:43 -08:00
3f939af4b4
Merge branch 'master' into addons-startup2
2020-02-03 16:17:33 -08:00
901cb520b9
Merge pull request #6452 from tstromberg/none-paused
...
Fix none driver bugs with "pause"
2020-02-03 16:16:34 -08:00
3dd5495d2f
trim kic base image ( #6478 )
2020-02-03 16:31:52 -07:00
e5e47db1c7
Choose the newest apiserver pid, and choose more exactly
2020-02-03 14:21:09 -08:00
4124fbdb69
Consider a paused apiserver to be controlled by a running host
2020-02-03 14:20:57 -08:00
04df96880e
Merge branch 'master' into none-paused
2020-02-03 13:49:21 -08:00
a8283d8a3c
Fix lint issue
2020-02-03 13:48:30 -08:00
2eddd08ae9
Fix test signature
2020-02-03 12:57:52 -08:00
769dd93aa0
Oops, make sure we return the error code
2020-02-03 10:56:53 -08:00
bcc186b908
Startup previously enabled addons
2020-02-03 10:49:40 -08:00
6cc2fc8e49
Call createRequiredDirectories when starting pre-existing VM's, add logging
2020-02-03 10:49:06 -08:00
fc85dd6d45
Handle node info in kubelet config
2020-02-03 22:31:59 +08:00
c6340c78e7
Fixes merge issue
...
Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>
2020-02-03 19:29:45 +08:00
f59a2891eb
Merge remote-tracking branch 'origin/master' into node-name
2020-02-03 19:16:57 +08:00
7e22609904
Merge branch 'master' of https://github.com/kubernetes/minikube into update-kubeadm-v1beta2
2020-02-01 23:59:09 -05:00
1176aa468f
More status logging
2020-01-31 19:00:59 -08:00
cee9448fa0
Make none.GetState more intelligent to fix stop issues
2020-01-31 18:54:27 -08:00
7f0e83508a
Add more logging
2020-01-31 18:44:00 -08:00
eee5788ab3
Make deletion output more terse
2020-01-31 17:08:27 -08:00
ae34f00928
Fix 'Failed to delete cluster: load: exit status 1' message if cluster does not exist
2020-01-31 17:00:11 -08:00
ab93b27a70
Merge branch 'master' into none-paused
2020-01-31 16:38:00 -08:00
e206b25da5
Merge pull request #6440 from tstromberg/addons-on-startup
...
Add addon enablement to start
2020-01-31 16:25:30 -08:00
dd4ad10b83
Improve handling of paused none clusters.
2020-01-31 16:23:25 -08:00
5c7585a2c8
Lint fix
2020-01-31 14:26:04 -08:00
c3aafaeeb4
Add IsNotExist() method to the config package, so that we can have meaningful error messages and make them comparable
2020-01-31 14:19:08 -08:00
a7ac0339fd
Address eview feedback
2020-01-31 13:24:30 -08:00
02362d8d9c
Loosen error message matching for unit test
2020-01-31 12:55:56 -08:00
f6740b37be
Run gofmt/goimports
2020-01-31 12:37:23 -08:00
26cbae2d05
Improve error message when profile does not exist
2020-01-31 12:36:28 -08:00
78ed12265d
Add testing for Start function, make addon enablement testable
2020-01-31 12:19:25 -08:00
0e5059ddd0
log warning if docker is stuck
2020-01-30 21:36:56 -08:00
a6ec05e35a
unexport noderolekey
2020-01-30 21:05:51 -08:00
968fe86869
unexport more funcs
2020-01-30 21:01:27 -08:00
Priya Wadhwa
Medya Ghazizadeh
Medya Gh
Thomas Strömberg
Song Shukun
Sharif Elgamal
Jose Donizetti
Wietse Muizelaar
Tam Mach
Anders Björklund
go_vargo
Zhongcheng Lao
Ruben
Vijay Katam