diff --git a/.drone.dev.yml b/.drone.dev.yml index 8e6fa42f4..e2e9d086a 100644 --- a/.drone.dev.yml +++ b/.drone.dev.yml @@ -1,5 +1,5 @@ clone: - path: github.com/vmware/docker-volume-vsphere + path: github.com/vmware/vsphere-storage-for-docker tags: true build: diff --git a/.drone.sec b/.drone.sec index e848b5fd9..82eb7fc33 100644 --- a/.drone.sec +++ b/.drone.sec @@ -1 +1 @@ -eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.ybGTZCVfOKSmxUAH0Ix0T5jRCHqd26wT2v15U9ofVc8wI0gA9sMv4xoXvnE_4eiQBNLhVF4Btpsb-5TSJPtP36-1yaxMUcE4B3rmJ3fEuT3t5G4b9ZmpCLGyhiuJkLbW8d2788P41jjBEFMxGTXMs6j9edpoafYPER97IXe4jdh14D5fXkx3AKk4YW6QTGlJpl_5gieWZ5xgIlci-kQBJdBJ3f0pI9RdE1xU3NpGWthhDI1WBdpxyokegmHjUxlkUEOJO130RTXTdKLelSdrs3DNIrIeghDHSUijcGvy16-LS0J8cb6nkx3zbQV9VejnSjvJ7yDI5R90uBptcD72yg.DBn-C-z2NgvanjTw.4zmcF_PLHBe0oHeMNbLIqSLP1p5Fk8TtDzgGOFUc5ybMvbZr8sAOXl7GddI0S5fzzeuFUDLJq-4uvOIdIIcHHrJVbbTCwkDm0ZlLplIMrZOYn3pm_-U5dGeh6ILj_jrIGEydeyfFiVfB6VNeC77MA2FbJXXXmaQ6HvuXlLw66kGe432ObVJE4HEYit-FpwyxFNgFcAofWB3v8eWMXTYso9umYBA2YWU0QbnQ7X6P4DLLfI3XCKpcQIc-iEyLIdQmyLOoGBOiRdvYTIbX5JoBRZPTRqLK3cKXuc9qZhE_wEQpMw4hEXnuR7fiOqsuxRpN-wcgYvOLGVDuqbWWu5KKdGmlpkhuQMExAwTSu9P0wgT_9po1YhrscOsbZ-95FyXQacY-AEmF7qxjNhaR8Gb3oErQRBvV6bo9x1Lr5hEMvl-02E8vkGNQ4iH-Ic4X77DKeyRb78p0IAd1eRA_wFCEdoRvBqoI7FBOLO_eiJCHLbB-W7PSMobRrHw4rMv9mPCzjC-LEFrBbwMkmc4W3X5WwVOL_t64Ov4SCw0D_DiFf_8EzJcZ18GuuUs9YjVV9f48yC6EC0t6SOkNMsFYT3Edex7VqPdLHkuJnOf2wbmQX2bh0hx2ZohG4oK0kL3hRGK4xN7kq_t-HS6FLLtgUYQ2T5dDDvVlfWUqULva3kG45mZv3R3MWSC-IJH5lt4Ag8Pc-htM8b2JnAOSy9JmL3X-fg1i2elTFRBc__RhMOhQ3YJFRTx9mbOxMEkbeqsNrIeLRuXS5di3AT7kQwAGg5K6P23ef5DTzqeUwZFhKoV5WufKtqozeo5fVNaEeaK2AENwjbp-tTweg_d0zrvyStoW1ESG3ZXfcewJN8fh4Flm3JWiY7F0cLUsbPxq_QC_0zWc40vO1qhXjEZtXRrWLG_m7lZAnGeJVnhnfQHvevejVW1x_r9GDvKX9f70E5rJ1RkBIf6Y-zttSNXXvDaXkBh0fqHF4YvIdbK_kBA3MHP6AE6zYQiwtZ0nyPUhaZfpv7Y5wncfr1di88obEQJ99M5AXBwaP82j3QGoFjOlWr--EokGtn65BcPcUWX4g-CEqlgjPzVytRbqlkIktma4UxbSc2w20J1B9sPmtYDA7RljMuXgjKTC9lQ6ob-8vzoov2HSE1bBeh6a3-bRqyc0ZoXLn-oq331EBASOXxmx8ZJA9xKVpvwK31yDkMq_lNnaUgHbb_hpTGI-BOHF8g46vxCMDZ4kqaqA559peAj5yxE8wrgJ9j7eISEt-EwWta-jhjHs_bPoPol4Y00KF6OwxSNtYOnLv8a5CLyGMRndAme27g66JYAlF8zayah2u1fz82T9njUDVqmdHynErEUCCSOU3EWOoYQIA5gK20ZMMAVggAFn0sJxxZ65an4JZhglPeHXt0gy9iMzNFbkkAE5rt4ISeH8QlTf9dK9u2uR8i8Wsf5AxlFCO3pbiGa-oUqySA7GvHDMJ4Pen4R8ctlDfu1IplgcLptMnBuIbZCfiGdi-nUIeJ7kSr8HBAOpw5RrRkK11HgbCja7m80nYgRFeF2-PlDctAQpx2IiglNuB5QobCbrGucNs-ii00Z0aRTZo-dhOdOll3QY65mgqXuSFjLZ3iJ5xDUEhSCiEdUxT-1pfDszDZ10WwPhxtPaefW0xi5lUcb3GoMqRfy-scPqEPECv0P-6BETSul1ibyIlN78Nr8qMI2krVWI2AiDA-AGCH6-yYoBshZqQuVior15EikVj8oWR3appz4yZSE8asTD7Fbfxhk468ZIU-G5I1O-VPLj-Op90Bp_s8J2ABf7j8mlW0rvySL6wNWcqa8xi8NPb75MEcWKYKdKWLKJzZ8u_xUpAUS0_IeabVgCB-Ck6SLE3Jjqeo_jh-3SBrYsaNZTspjzBM52s5LDkY-IO9tUf8usxjRKl4YgZeL1GFYy1tRqjGil1DIOeJVW4XpFchJOTKl_pvz3l-Ox8LvW8XUJfvYHNs_Y8K7DX66e-kJtjzZj1EtepBd4OjmD2CV_Ez1YtEGvYcVfpORMyqzTqQtdxCy_yBnDFH95WUNYPONAmhu9kyCDxRDW3Y_QJV4H6cglhpvG2x7vWQTB3Z8d2aIyVNLXm5m_TQoqiGgY1T6ATKq70_Va5aQBMDXMd93IK9owW39ZleKpArr4H_bpUiuxX8slapogybCkCyjp9tZJOiA2dO3ZEYPhR9VjZNCsry1gqNE9RFFS8QxWqhHlJ7MjzAtzvdeqCFEieMW5-_TqfV06QIE0suDGKJvVtCnUQCSXP8x-maLCONe485EKhFIZJPaurr5I0LzSkqCnav48PBkWNXHs-NU19YFCC2BlQvpSJE1-2z52_CkbKLVP9Jum3D46l0UR-GGz_IWULqG41FOZcD6VzmQuYGCzPSC0FXxgJQn3jTH3yuw-iwr9kTNWt6ifsvpG3e7PpUWijjEn4lmeL-NX7Fl59j3hWwZ0Dqpb7Eu9jdS5lf8uhSkV3jvw_t-zSO7WpSOb1W1emSQFXtdY_fOiBJWGrGRwt0EEVWkdQKxjtyS8x7bFsN0J9sZhc0s_gh6mrlLbECPjzUxf5aJsBMlzFe9FVgQ3qYXSRtx7S2rLpDVu3sgdnBlqUjfWbtrSWkV3DKV14yFT8PCmpnf1P0lwCOjsYo7vbxxiqBRhskGKoyDuDAtDkkOTICGb1D6nmvv1X-ugTWvwyJ9Zx3PKSAmG2rzDiIJn9VgokJOmJYZKINam7GnTNrq7esAL8zoVSWjtNN8yNo7ltqUNvBTYZ2Q5EU967um1ShET4XjXH7H8AYrqmGXvKoZyoXrlLxf4pVCO6Jr9ApSgZsYQB3OcsqQScB9OVhcrai1FYDN8pLi5DbvNSGWTQK-JA3tg-vTU2ZO93moOoIM24-ThlrvAcwGryDB_2raWvXhBCK6Wr66AQJXOJvchl3lJF_agIAMidFe5Yzh2f2EywONnF2ozAffAoSie8Wbwncaq6wHv8b0NRroSgb9e47V6hCb5wu_PlZzDk8se6rqIMo3k440l9LU65D1ff9z_x3ET6TSwajVzQmfM084NIWSC2khpILAUjo6Cs5UOGmLWQi9QgxgGUOAVTI5yeDpcWeoVNi6eMsXSfEsaL2kGvAIuWXWku6Aua1WYKj6zD4bQGACLJ9oRPodEFmuI6KSeLCUCQk4dufHHL9u-gfx_359owigfE4hriVmszEzaWmN2M0O7FYdXu-869l2a9FVqAHvs7ZdQ9YcFfj4HXqvgN2w-JSht4wtUJKbBxYHAqWYGJJ51l8q1iCfnS160hobrVKSGyNNU-0GomnKLfzZoi5stMZstnvJK9WOpf4-neKcCLhPSM3YG6gsP411t5WEuz9TRRD-UHHjgVLX9b9TLw9bJnQHXa1H9QOo4zJtOkbLr60znfbOCJT1lCJmII-8oNEsDzEv7g2j06VgVRHYxIh0iXrEYn8RyxddAvoHPhPgSJMFoTwl_wiGzqpdxzksZZYvTMMbGvUQUJbUBQ6U9bCyoZiR04_8BcuLILrC3SdbigvLOEqWxp6SnbscFa1T2WIkvZgRDnGtkPIDHpNdeI4i_wff0jBod8o2l92Q_Y2qcW3q1F9ztzhSU1U6MuhoHSw9DjM-ld29LYun9m_NHZYaneVO0Ie1Q58Xw8vRin3r9q467wGxSPXeVSSf8cUVfwaucmBpED3MeAhrqkmzKqMeILsc9s7XOrymX9MGBQtEsjy-ARJyXx98cVsdzx5AThHgLD8Z6Zuiw-_pvdD4dw_qgdrWBKsyoHLC1X2Bkd2i9Eak463wfEs72f86xFbri6DYnlXuLTz42C6udtIqfWgUm-D8To0-Tek51zjp6JY22-BYqjLfrXNG8N-jnGiGNHkBFuIZh6bUKARbzXEXffMD4_OoV_T4eR8ACx1eKWZGovLNPJqCKqiFYC3_UsfTMl5X0DVGoN6QIKKYwEHlQdu8.eizlNHNuAHPkdk_BUUn2Jw \ No newline at end of file +eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.IVfPU6-O85NWiOEfbRmXknkSwqKvEcI67Y-gPEw63GxX4pEApVJlkW5RoQPgXc353QZHmKciK9SukzYcLzpuMUTxHFenx6DE2b1mPOKCtktB1cEJjS0XVk3dndWYHgJ_BC1a05DycIqJFtr85be33ZqfKZOWo49PUQRhz_eaOJAGtvxRzScTBFlCyfR42ri9IOD4ejCZS0UWfK5ULndAOhWu49m2DWoAM3bd2jHAwJYEFAoP0-65n68-W5mAX5bJYF-6WDieK16n7oaxCkfkY73Pf3huSOp9XP7NXXLjND9x04IND4pEX9ERR4puAY-9RHLUzSRC9T8QIB1PZ7_zHg.HAi0ADr-nToeQiA4.5QXgkwHYWCAB2fjZawQGAqgpToS3FAhPkjpPnecZhYGv-FPnjL0z2QQH6iJ98OOB36omcqt78_GdmZ7gdnYGa5ax6KJAx2V72wZ3dy0TJsO5M-RkmS1omEC2E1JzZAzdFMZOMK3G3Ji1gvei9QprvTzZbcXJ5YKYzWo6mNnZlf73rQB8-9kjarH0OBjTjEtsHm62b3-K1TeU61ECt3t4yPplBJFGbz3fKkpORLGKdNr0pBpOIcpcYrRponqM6_-ISQRj95UKEDu9vKt9lDaELAFhMLrDTlJ4b-D5zdz8n6v0_d42qXhWBQJ9j2peA5T4ZC6QYluL-YBsueSLLjw8lZ5I_ij5eW_hSpx0-n7H2POAMcHW1__DSphKsk9ntA9YoECvGFl5zOGu2YtS2jyNImWYhX4VCJRf3li65sXr1majvCR6BwfsUDaxyVOwc3qNzOaF3BVP9fjtjQgt_Y1euFYQo_vasQ0KGcHnCiJdAFPBxCtHCtWCki6YAHZmlSvozRUD2JUGENkPmuOANKzox90LF21GMakCIn8OhhQ9k69a2DNiW1B1RdDEE4Dm8qsfN9NffVMefh4w942G9ekfSML6qXDucbxlMcFfN-25rjmOdIr0lQt49XGWdnHMv2KGpNqtYyXGv0s4pdT-g-INp1ywau1QOSOvuMOgzAPDYvn6liAw-JkzgJD7WD9FvZgqc1f7oPVFlvGyq6fj2DEeMTyGZnGPIDoto5oZxYPnLP0qUdZI1wyuADvLQwClT0QcZgNrIL1oJ_hmtSiwtsHJeAM44eBTeVOqTfYgo1j51nSHsBmKnBUw9iHV8Z6QVxK8cJ2yUduim_beN1sZrZTI37-zaD9mUKycNqIebut7_HCZ7ifRwkpgYzaYOuqw3pd4Syoe36SdFRgdSPvsMxgV7Ti2Fdw-mk0ZRNTr1mYWyUABWyvPpvt_yzPFfFixjjiPP9VE-VkhRzeXyGBugtYNPpTta0H0-8ca8Yivfvok3xc996bCiAcOb-tzhqtoLuZUrfaUAKDZTRkmedemsDa49hUsO5BQO5qkaUJ2-k2wUsOsnfsUvpiQWev-6YQ6imS_Nh_kWb-7kS-pqlf89T7MouyKyiZ-MdoIOnqPrfu_Xqw2w9dOBaZwOwjorOdcC1CTsKqJrMulwW0IgnquQWi0BRLBd6r2IVnOkYRD5lrW9X5NNqWBT4DGCVEu9uxX7VWBiiQwTQZKpwHgrn-_V4ByWXt7YxO85gWwtGXQNoNfhwzFEuQ7bHeRx-xc985dodlHsbrWXbRCobC6NZYESEJugKxLGYjt6uHuh3jLhvIicAGEPG0z1bSMVz_1_YrAJfrfTW_H88JWNW0COqZUTVMF9zU9HLm9HRRZiBebDt1nJUHiDs2IW-FU5yHbqspNyW0jYfauimBZTf4lc1-h0b5P_-IDDeD3tB4FJ0wFadX3JORCcBxy_Vz77TT1VyKmTXMVP7PzA1DRaorvfTD2lVEGe3GnVkJo5kAL-Vz7TWnN6pS2G6IKUfuwDxihwzwQdnwNOdrYVFJWhVQGt5IXlbzIH0cJP_Ekri0hMQhHwCIi5FYQie6lzzeqRyobhsCI_XzZg8m7YYwgKcPbnJPzKta1ROu4471Bt60fIhC0mgfkQqnGktNvfXvshXtTt5eTdbOnlJOwqX5PiTPR6Yv35VvpgC9EfgnV-pKt3eT4Mur9LeUUITc1Nb26bFSpIMZl5ey5UuN2vdbxw2pW0s3MPavMnRvxMQV9A7ktFVCQ6AEnYrjzaa6M7EIAnublEdFh0tOQyXNAfNh-yZEPLbWUEPoHP2MgVKtQVhEJSesreoZwi1bWuq6mT41jNjBQwO229l44R2vxbt6QGMmAF5wATx--EsNb17ElSHHTHYdqM1I04EHjB32GkVHGSkW781FZiWIIBqGPFSZXI1H5lT4oYB1IAMcU4AU-QEEqAWeb1dDS--gCL7NcglbFp8WCNAiL5HbIqL43vS77P9VwEaWSEuMKeJ0r-2XBrEghTTNCWcuvks8EWnOytkufM8HqNBYdF-MKA-1ZVgGC4L6SIKstR17eXbgenXFtB3OhNe8j_i2brPAjGzVPsgJKT593rR68dVmHvwE_2Kplw4C47LAskDd0bQxSDlf0pucpy7XRitWxZeg9AGvattKeKvHmcyUry5zuFlX5uSywxhtPbCwd8yn5yykdxGX0QVNq3wK59TCHl6KxAOod32kiSxi_4LiNhssmSAi8iQKz9GCauXAJ5nRF9zx3kmmsmo1r68Qks5m9H6yiuDD8vJWoD55iiBkIhNYOv_yeVJcqU1XOkuKQw7zbkTIx-wWiP6zTuOq74jJvhhxT0yZ-wWV_EcELGjoeWKBWSronjnGc8p4R7BPwiQmu4_8rumuKDrvnti_modpFdmlWZxO2w-zRds_eXKdZrOBjzSVAMI1i3yVrq7nHpKoZyTDSyVBCB4JMSASByAOOg54FIzOAD1QXEEeqgsBtZhQ91_10oaAcdMSyc3R_BEuOkX3aOMJANZV8vu9QL3T6rtaN5TfETW_BYxB3ade370I-ma6fWw8w0Ob0p3tPU1hDT9L95-RuEvOCBlmPi1GHlzGyJhNmZ3RJJuY9rB5Y6AqeEzudNKFogV09ClO44ZR6SVKuRC27nn7tboO0H2BG1R7Dt8u3oUvrEwQ9xL-hWqK3y8MfBhSPgt-_7JNpzqEevrPmjG1DhUjN3OgbjeqcGNwmZeeWCYQF_gpCGQbGN_4RZ5SNZa6VJjsO3ZtFpQCpvMLzih1gXnuSocbgpl0LjnTQO2mJOZZMfBSEb1RRvHIvvFMORF8PfRNOwEc2rNCSUCyFUaNmHKfdXEWYVanvGERBaKv6jS8E-dYc2bVHP1nXp0yPi_NzAWcIX5tadqoJytxJUD9p6zjR0mztTvbua6kkInnIqfcEEmX_NcI0GltFeYltDCCUxuwBiULWyIreWnLWXspp21gC6dzhK5_2C6t1yLQg7bf0z91om8q7SMDV21amgWz5EUSbwClOqiy2TUqj2FngVimNnaPEiErmjdjJB3PLKUGmH0Yk1x1wPEIDcCAyOQ-EtDV29k2zo5BsKd7P-9wa5Pm8TG0UQ-7rx4UaZSOqhMi1Ck5xYuINtZROUYPyCRnnpC9OyjDIt7ZS5-7z1izNKAyzjCUVfZJK3sPxaRCCrJVSooBSb_lZYWw91WttbgIsU1sF82YCHbPCLhxl4K2eOFnxEMgG4zcYFxICog4RKDo_Z6jaM7ZYfX6GAJ95rAzA0bnbfRKg96EdYROs_GOyglODc74OdFzgkgAiNmJsN0Yh1WRyI0pPGG-hOX6b0qhjk2JF2IM_AeszVRo8v991ti2U3iiZdxnlQGZp35IsJ4cIQc6ziKTm9wypftKPW7czGj2aUsUc5UrJM30k9FswN4n3zKjdFAJNvN1jXayixF5SVl82ORBKFieRZuI_4uck_MmcRuyX8ulMnD0NhpuYMdRWRAIg9z0s9ROoQ3Piy5d3Wkw6D-hwnFsRyWkMpYn9HV1KXGwRKom28gc01p4pRR33txy-oymDVJbdq0WKIddR8chMeC_5DNiwTN3hoO5l8TLiQ4aKWstWtjA9yWoXhC39VgNu1HHUJ0URBZzpCcwSOp4I1AzBgva2skJwL6TzgLpLHE7QJUaaK3zuZ9afonMRfOmlU2190HSm11xYVWmi0onQZM0EcyUGMR2qA85VJiQwng9WCv1NZSmD09MTYqTh3C_zIuOnwYeQqISw4qV8CKOArO8r2Py4MPbeQCC6lsjcYoIBdblsEL8g9ldQzT9PAk6Expaxn15Ngh2NKnbtY4VU4PYbtNCn1bTnHMWGlIx6L5WH4ZeFsHBDxMo3drabnLSQB1rVPsugdd1xsHFaiT_QWhKLoe9CBkFRJTSUMkkkdEqEjpEKyFldMAEEceOP6D0UMFJ3SiEgRegWgS1BoSY.29A7iyRQM_A99_do1L4C8w \ No newline at end of file diff --git a/.drone.yml b/.drone.yml index 24c805c51..4cabddaf1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,5 +1,5 @@ clone: - path: github.com/vmware/docker-volume-vsphere + path: github.com/vmware/vsphere-storage-for-docker tags: true build: @@ -20,7 +20,7 @@ build: - ESX_6_5=$$CI_ESX_NAME_6_5 - GOVC_URL_6_0=$$CI_ESX_IP_6_0 - GOVC_URL_6_5=$$CI_ESX_IP_6_5 - - SSH_KEY_OPT=-i /drone/src/github.com/vmware/docker-volume-vsphere/key + - SSH_KEY_OPT=-i /drone/src/github.com/vmware/vsphere-storage-for-docker/key - GOVC_GET_IP=govc vm.ip -a -v4 - KEY=$$KEY - DOCKER_HUB_REPO=cnastorage @@ -49,8 +49,8 @@ build: - go get github.com/golang/lint/golint - go get -u gopkg.in/check.v1 - make -s build - - echo $KEY | base64 -d > /drone/src/github.com/vmware/docker-volume-vsphere/key - - chmod 0600 /drone/src/github.com/vmware/docker-volume-vsphere/key + - echo $KEY | base64 -d > /drone/src/github.com/vmware/vsphere-storage-for-docker/key + - chmod 0600 /drone/src/github.com/vmware/vsphere-storage-for-docker/key when: *branches build_events: diff --git a/.project b/.project index 19f8a168c..7737aef94 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - docker-volume-vsphere + vsphere-storage-for-docker diff --git a/CI.md b/CI.md index 3c44ac0cf..5f7cf3c98 100644 --- a/CI.md +++ b/CI.md @@ -58,7 +58,7 @@ sudo install -t /usr/local/bin drone ``` mkdir -p $GOPATH/src/github.com/vmware cd $GOPATH/src/github.com/vmware -git clone https://github.com/vmware/docker-volume-vsphere.git +git clone https://github.com/vmware/vsphere-storage-for-docker.git ``` * Setup ssh keys on linux nodes & ESX @@ -78,6 +78,6 @@ Test SSH keys, login form the drone node should not require typing in a password * Run drone exec ``` -cd $GOPATH/src/github.com/vmware/docker-volume-vsphere/ +cd $GOPATH/src/github.com/vmware/vsphere-storage-for-docker/ drone exec --trusted --yaml .drone.dev.yml -i ~/.ssh/id_rsa -e VM1= -e VM2= -e ESX= ``` \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5d0fb254f..930785afb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,21 +1,21 @@ ## Table of Contents -* [Dev Setup and debugging help](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#pull-requests) -* [Bug filing guidelines](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#bug-filing-guidelines) -* [Typical Developer Workflow](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#typical-developer-workflow) -* [Photon VM specific configuration](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#photon-vm-specific-configuration) -* [Testing configuration](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#testing-configuration) -* [Windows plugin contribution guidelines](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#windows-plugin-contribution-guidelines) -* [Managing GO Dependencies](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#managing-go-dependencies) -* [Capturing ESX Code Coverage](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#capturing-esx-code-coverage) -* [CI/CD System](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#cicd-system) -* [Release naming convention](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#release-naming-convention) -* [Guidelines for cutting a new release](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#guidelines-for-cutting-a-new-release) -* [Documentation](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#documentation) +* [Dev Setup and debugging help](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#pull-requests) +* [Bug filing guidelines](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#bug-filing-guidelines) +* [Typical Developer Workflow](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#typical-developer-workflow) +* [Photon VM specific configuration](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#photon-vm-specific-configuration) +* [Testing configuration](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#testing-configuration) +* [Windows plugin contribution guidelines](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#windows-plugin-contribution-guidelines) +* [Managing GO Dependencies](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#managing-go-dependencies) +* [Capturing ESX Code Coverage](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#capturing-esx-code-coverage) +* [CI/CD System](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#cicd-system) +* [Release naming convention](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#release-naming-convention) +* [Guidelines for cutting a new release](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#guidelines-for-cutting-a-new-release) +* [Documentation](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#documentation) ## Code Contribution guidelines ### Dev Setup and debugging help -Read the [FAQ on the Wiki](https://github.com/vmware/docker-volume-vsphere/wiki#faq) +Read the [FAQ on the Wiki](https://github.com/vmware/vsphere-storage-for-docker/wiki#faq) ### Pull Requests * Create a fork or branch (if you can) and make your changes * Branch should be suffixed with github user id: `(branch name).(github user id)` Example: `mydevbranch.kerneltime` @@ -139,7 +139,7 @@ export SSH_KEY_OPT='-i /Users/username/.ssh/id_rsa' - `MANAGER1` - swarm cluster manager node IP - `WORKER1` & `WORKER2` - swarm cluster worker node IP -**Note**: You need to manually remove older rpm/deb installation from your test VMs. With [PR 1163](https://github.com/vmware/docker-volume-vsphere/pull/1163), our build/deployment script start using managed plugin approach. +**Note**: You need to manually remove older rpm/deb installation from your test VMs. With [PR 1163](https://github.com/vmware/vsphere-storage-for-docker/pull/1163), our build/deployment script start using managed plugin approach. Examples: ``` @@ -184,7 +184,7 @@ Standard invocation on ESX: python -B /usr/lib/vmware/vmdkops/bin/vmdk_ops.py Standard invocation on VM: (as root) -/usr/local/bin/docker-volume-vsphere +/usr/local/bin/vsphere-storage-for-docker ``` To remove the code from the testbed, use the same steps as above (i.e define @@ -291,7 +291,7 @@ Add a multi-string key named Environment and add the following lines to it. # deploy the plugin: make deploy-windows-plugin - + # run the tests: make test-e2e-windows @@ -342,7 +342,7 @@ COVERAGE_PROCESS_START DEFAULT=/coverage.rc ## CI/CD System -The CI/CD system is based on [Drone platform](https://drone.io/) and the server is https://ci.vmware.run/. More information is found at our [CI.md](https://github.com/vmware/docker-volume-vsphere/blob/master/CI.md) +The CI/CD system is based on [Drone platform](https://drone.io/) and the server is https://ci.vmware.run/. More information is found at our [CI.md](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CI.md) ## Release naming convention The following is the plan for GA and post GA releases. Before GA, the release name format remains the same e.g. 0.XX (existing release tag) @@ -383,7 +383,7 @@ Check to see if the new release shows up on GitHub and the CI build has started. ### Generate the change log ``` -docker run -v `pwd`:/data --rm muccg/github-changelog-generator -u vmware -p docker-volume-vsphere -t --exclude-labels wontfix,invalid,duplicate,could-not-reproduce +docker run -v `pwd`:/data --rm muccg/github-changelog-generator -u vmware -p vsphere-storage-for-docker -t --exclude-labels wontfix,invalid,duplicate,could-not-reproduce ``` Manually eye ball the list to make sure Issues are relevant to the release (Some times labels such as wontfix have not been applied to an Issue) @@ -395,7 +395,7 @@ Head to GitHub and author a new release add the changelog for the tag created. 2. Remove VIB/DEB/RPMs from the ```Downloads``` sections 3. Perform steps from internal Confluence page to sign the VIB -**Note**: Update [vDVS_bulletin.xml](https://github.com/vmware/docker-volume-vsphere/blob/master/docs/misc/vDVS_bulletin.xml#L19) to keep it current with the release and check changes to `[vmware/master]/docs/misc/vDVS_bulletin.xml` (see below to update the content per release) +**Note**: Update [vDVS_bulletin.xml](https://github.com/vmware/vsphere-storage-for-docker/blob/master/docs/misc/vDVS_bulletin.xml#L19) to keep it current with the release and check changes to `[vmware/master]/docs/misc/vDVS_bulletin.xml` (see below to update the content per release) ``` vDVS_driver-0.15 (0.15 refers to version) @@ -407,7 +407,7 @@ Head to GitHub and author a new release add the changelog for the tag created. mentioned in the email and download the signed offline bundle. Offline bundle will be a zip file something like ```vDVS_driver-0.18-offline_bundle-7032243.zip```. From the offline bundle, extract the signed VIB. 5. Head to [Bintray](https://bintray.com/vmware/product/vDVS/view) to publish signed VIB as well as offline bundle 6. Push vDVS & vFile managed plugin to docker store and windows plugin to bintray -7. Add ```Downloads``` section with direct links; take [Release 0.13](https://github.com/vmware/docker-volume-vsphere/releases/tag/0.13) as the reference +7. Add ```Downloads``` section with direct links; take [Release 0.13](https://github.com/vmware/vsphere-storage-for-docker/releases/tag/0.13) as the reference ### Publish vDVS managed plugin to Docker Store **Note**: not automated as of 04/04/17 @@ -429,14 +429,14 @@ DOCKER_HUB_REPO=vmware EXTRA_TAG= VERSION_TAG=latest make build-all Windows plugin needs to be built on a windows environment 1. export WIN_VM1=[Valid Windows VM IP] 2. make build-windows-plugin -3. rename the build/windows/vdvs-bin.zip to /build/windows/docker-volume-vsphere_windows_.zip +3. rename the build/windows/vdvs-bin.zip to /build/windows/vsphere-storage-for-docker_windows_.zip ### Upload files to bintray Two files need to be uploaded to bintray at https://bintray.com/vmware/vDVS/vDVS_Windows Following are their paths (with respect to vDVS root working directory) 1. install-vdvs.ps1 -2. /build/windows/docker-volume-vsphere_windows_.zip +2. /build/windows/vsphere-storage-for-docker_windows_.zip ## Cutting release steps for vFile plugin ### Publish vFile managed plugin to Docker Store @@ -449,12 +449,12 @@ DOCKER_HUB_REPO=vmware EXTRA_TAG= VERSION_TAG=latest make build-vfile-all ## Documentation Documentation is published to [GitHub -Pages](https://vmware.github.io/docker-volume-vsphere/) using +Pages](https://vmware.github.io/vsphere-storage-for-docker/) using [jekyll](https://jekyllrb.com/). 1. Documentation is updated each time a release is tagged. 2. The latest documentation for the master can be found in - [docs](https://github.com/vmware/docker-volume-vsphere/tree/master/docs) in + [docs](https://github.com/vmware/vsphere-storage-for-docker/tree/master/docs) in markdown format To copy documentation changes from vmware:master to gh-pages, run the following script diff --git a/Commonvars.mk b/Commonvars.mk index 53a8ce088..b134f35ee 100644 --- a/Commonvars.mk +++ b/Commonvars.mk @@ -29,10 +29,10 @@ export # To check resulting settings use "make info" # examples: # make -# --> resulting name (for my build as of 3/17/17) msterin/docker-volume-vsphere:0.13-dev +# --> resulting name (for my build as of 3/17/17) msterin/vsphere-storage-for-docker:0.13-dev # # DOCKER_HUB_REPO=vmware EXTRA_TAG= VERSION_TAG=latest make -# --> resulting name vmware/docker-volume-vsphere:latest +# --> resulting name vmware/vsphere-storage-for-docker:latest # # DOCKER_HUB_REPO=cnastorage EXTRA_TAG=-CI make # --> resulting name cnastorage/docker-volume-vspehere:0.13-CI @@ -53,7 +53,7 @@ EXTRA_TAG ?= -dev PLUGIN_TAG := $(VERSION_TAG)$(EXTRA_TAG) # plugin name - used as a base for full plugin name and container for extracting rootfs -PLUGIN_NAME ?= $(DOCKER_HUB_REPO)/docker-volume-vsphere +PLUGIN_NAME ?= $(DOCKER_HUB_REPO)/vsphere-storage-for-docker VFILE_PLUGIN_NAME = $(DOCKER_HUB_REPO)/vfile # Managed plugin alias name diff --git a/README.md b/README.md index 2fabc99af..d64190cfa 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Build Status](https://ci.vmware.run/api/badges/vmware/docker-volume-vsphere/status.svg)](https://ci.vmware.run/vmware/docker-volume-vsphere) -[![Go Report Card](https://goreportcard.com/badge/github.com/vmware/docker-volume-vsphere)](https://goreportcard.com/report/github.com/vmware/docker-volume-vsphere) +[![Build Status](https://ci.vmware.run/api/badges/vmware/vsphere-storage-for-docker/status.svg)](https://ci.vmware.run/vmware/vsphere-storage-for-docker) +[![Go Report Card](https://goreportcard.com/badge/github.com/vmware/vsphere-storage-for-docker)](https://goreportcard.com/report/github.com/vmware/vsphere-storage-for-docker) [![Docker Pulls](https://img.shields.io/badge/docker-pull-blue.svg)](https://store.docker.com/plugins/vsphere-docker-volume-service?tab=description) [![VIB_Download](https://api.bintray.com/packages/vmware/vDVS/VIB/images/download.svg)](https://bintray.com/vmware/vDVS/VIB/_latestVersion) [![Windows Plugin](https://img.shields.io/badge/Windows%20Plugin-latest-blue.svg)](https://bintray.com/vmware/vDVS/vDVS_Windows/_latestVersion) @@ -8,26 +8,26 @@ vSphere Docker Volume Service (vDVS) enables customers to address persistent storage requirements for Docker containers in vSphere environments. This service is integrated with [Docker Volume Plugin framework](https://docs.docker.com/engine/extend/). Docker users can now consume vSphere Storage (vSAN, VMFS, NFS) to stateful containers using Docker. -[](https://store.docker.com/plugins/vsphere-docker-volume-service?tab=description)vDVS is Docker Certified to use with Docker Enterprise Edition and available in [Docker store](https://store.docker.com/plugins/e15dc9d5-e20e-4fb8-8876-9615e6e6e852?tab=description). +[](https://store.docker.com/plugins/vsphere-docker-volume-service?tab=description)vDVS is Docker Certified to use with Docker Enterprise Edition and available in [Docker store](https://store.docker.com/plugins/e15dc9d5-e20e-4fb8-8876-9615e6e6e852?tab=description). If you would like to contribute then please check out -[CONTRIBUTING.md](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md) -& [FAQ on the project site](http://vmware.github.io/docker-volume-vsphere/documentation/faq.html). +[CONTRIBUTING.md](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md) +& [FAQ on the project site](http://vmware.github.io/vsphere-storage-for-docker/documentation/faq.html). ## Documentation -Detailed documentation can be found on our [GitHub Documentation Page](http://vmware.github.io/docker-volume-vsphere/documentation/). +Detailed documentation can be found on our [GitHub Documentation Page](http://vmware.github.io/vsphere-storage-for-docker/documentation/). ## Downloads -**Download releases from [Github releases](https://github.com/vmware/docker-volume-vsphere/releases) page** +**Download releases from [Github releases](https://github.com/vmware/vsphere-storage-for-docker/releases) page** The download consists of 2 parts: 1. VIB (vDVS driver): The ESX code is packaged as [a vib or an offline depot](http://pubs.vmware.com/vsphere-60/index.jsp#com.vmware.vsphere.install.doc/GUID-29491174-238E-4708-A78F-8FE95156D6A3.html#GUID-29491174-238E-4708-A78F-8FE95156D6A3) 2. Managed plugin (vDVS plugin): Plugin is available on [Docker store](https://store.docker.com/plugins/e15dc9d5-e20e-4fb8-8876-9615e6e6e852?tab=description). -Please check [vDVS Installation User Guide](http://vmware.github.io/docker-volume-vsphere/documentation/install.html) to get started. To ensure compatibility, make sure to use the same version of vDVS driver (on ESX) and managed plugin (on Docker host VM). +Please check [vDVS Installation User Guide](http://vmware.github.io/vsphere-storage-for-docker/documentation/install.html) to get started. To ensure compatibility, make sure to use the same version of vDVS driver (on ESX) and managed plugin (on Docker host VM). ## Supported Platforms @@ -49,17 +49,17 @@ journalctl -fu docker.service # Journalctl/Systemd **vDVS Plugin logs** -* Log location (Linux): `/var/log/docker-volume-vsphere.log` -* Log location (Windows): `C:\Windows\System32\config\systemprofile\AppData\Local\docker-volume-vsphere\logs\docker-volume-vsphere.log` -* Config file location (Linux): `/etc/docker-volume-vsphere.conf`. -* Config file location (Windows): `C:\ProgramData\docker-volume-vsphere\docker-volume-vsphere.conf`. +* Log location (Linux): `/var/log/vsphere-storage-for-docker.log` +* Log location (Windows): `C:\Windows\System32\config\systemprofile\AppData\Local\vsphere-storage-for-docker\logs\vsphere-storage-for-docker.log` +* Config file location (Linux): `/etc/vsphere-storage-for-docker.conf`. +* Config file location (Windows): `C:\ProgramData\vsphere-storage-for-docker\vsphere-storage-for-docker.conf`. * This JSON-formatted file controls logs retention, size for rotation and log location. Example: ``` {"MaxLogAgeDays": 28, "MaxLogFiles": 10, "MaxLogSizeMb": 10, - "LogPath": "/var/log/docker-volume-vsphere.log"} + "LogPath": "/var/log/vsphere-storage-for-docker.log"} ``` * **Turning on debug logging**: @@ -71,7 +71,7 @@ journalctl -fu docker.service # Journalctl/Systemd e.g. ``` - docker plugin install --grant-all-permissions --alias vsphere vmware/docker-volume-vsphere:latest VDVS_LOG_LEVEL=debug VDVS_SOCKET_GID= + docker plugin install --grant-all-permissions --alias vsphere vmware/vsphere-storage-for-docker:latest VDVS_LOG_LEVEL=debug VDVS_SOCKET_GID= ``` **vDVS Driver logs** @@ -81,7 +81,7 @@ journalctl -fu docker.service # Journalctl/Systemd logging config format for content details. * **Turning on debug logging**: replace all 'INFO' with 'DEBUG' in config file, restart the service -Please refer [vDVS configuration page](http://vmware.github.io/docker-volume-vsphere/documentation/configuration.html) for detailed steps. +Please refer [vDVS configuration page](http://vmware.github.io/vsphere-storage-for-docker/documentation/configuration.html) for detailed steps. ## Tested on @@ -102,8 +102,8 @@ Please refer [vDVS configuration page](http://vmware.github.io/docker-volume-vsp ## References -* **Known Issues**: Please check [vDVS known issue page](http://vmware.github.io/docker-volume-vsphere/documentation/known-issues.html) to find out about known issues. +* **Known Issues**: Please check [vDVS known issue page](http://vmware.github.io/vsphere-storage-for-docker/documentation/known-issues.html) to find out about known issues. -* **Contact us**: Please [click here](http://vmware.github.io/docker-volume-vsphere/documentation/contactus.html) for requesting any feature or reporting a product issue. +* **Contact us**: Please [click here](http://vmware.github.io/vsphere-storage-for-docker/documentation/contactus.html) for requesting any feature or reporting a product issue. - * **Blogs**: Please check our [vDVS blog page](http://vmware.github.io/docker-volume-vsphere/documentation/blogs.html). + * **Blogs**: Please check our [vDVS blog page](http://vmware.github.io/vsphere-storage-for-docker/documentation/blogs.html). diff --git a/build.bat b/build.bat index 2e85c5642..323802c9a 100644 --- a/build.bat +++ b/build.bat @@ -27,7 +27,7 @@ :: :: Building :: -------- -:: Start cmd and cd to the docker-volume-vsphere directory. +:: Start cmd and cd to the vsphere-storage-for-docker directory. :: Execute build.bat. :: ---- Setup ---- @@ -96,7 +96,7 @@ echo Moving binaries to the build directory. if not exist %winBuildDir% mkdir %winBuildDir% move /y %vmdkopsDir%\vmci_client.dll %winBuildDir% move /y vdvs.exe %winBuildDir% -powershell Compress-Archive -Path %winBuildDir%\* -DestinationPath %winBuildDir%\docker-volume-vsphere.zip -Force +powershell Compress-Archive -Path %winBuildDir%\* -DestinationPath %winBuildDir%\vsphere-storage-for-docker.zip -Force echo Successfully moved binaries to the build directory. cd %projectRoot% diff --git a/client_plugin/Makefile b/client_plugin/Makefile index dfb4bd642..93640e30d 100644 --- a/client_plugin/Makefile +++ b/client_plugin/Makefile @@ -36,7 +36,7 @@ EPOCH := 0 SCRIPTS := ../misc/scripts # Packaging variables -PLUGNAME := docker-volume-vsphere +PLUGNAME := vsphere-storage-for-docker VFILE_PLUGNAME := vfile GOPATH_PLUGNAME := $(PLUGNAME)/client_plugin INSTRUMENTED_PLUGIN_BIN := vdvs-instrumented diff --git a/client_plugin/README.md b/client_plugin/README.md index d7164e4c6..4f2818e56 100644 --- a/client_plugin/README.md +++ b/client_plugin/README.md @@ -1,4 +1,4 @@ -This directory contains code for client (docker) side of docker-volume-vsphere. +This directory contains code for client (docker) side of vsphere-storage-for-docker. * ***.go** - GO code implementing Docker Plugin API (used docker/go-plugins-helper) * **vmdkops** - Client Module (in GO) with C interface for communicating over VMCI diff --git a/client_plugin/default-config.json b/client_plugin/default-config.json index 8418fd4d1..5f6f846e6 100644 --- a/client_plugin/default-config.json +++ b/client_plugin/default-config.json @@ -1,5 +1,5 @@ {"MaxLogAgeDays": 28, "MaxLogSizeMb": 10, "MaxLogFiles": 10, - "LogPath": "/var/log/docker-volume-vsphere.log", + "LogPath": "/var/log/vsphere-storage-for-docker.log", "LogLevel": "debug"} diff --git a/client_plugin/drivers/photon/photon_driver.go b/client_plugin/drivers/photon/photon_driver.go index f21bbf999..25853a36f 100644 --- a/client_plugin/drivers/photon/photon_driver.go +++ b/client_plugin/drivers/photon/photon_driver.go @@ -26,7 +26,7 @@ package photon //"fmt" //"path/filepath" -//"github.com/vmware/docker-volume-vsphere/client_plugin/utils/fs" +//"github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/fs" //"golang.org/x/exp/inotify" import ( "flag" @@ -37,12 +37,12 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/go-plugins-helpers/volume" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/utils" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/config" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/fs" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/plugin_utils" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/refcount" "github.com/vmware/photon-controller-go-sdk/photon" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/utils" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/config" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/fs" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/plugin_utils" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/refcount" ) const ( diff --git a/client_plugin/drivers/utils/pluginDriver.go b/client_plugin/drivers/utils/pluginDriver.go index 58171f319..6c3062bbe 100644 --- a/client_plugin/drivers/utils/pluginDriver.go +++ b/client_plugin/drivers/utils/pluginDriver.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/refcount" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/refcount" ) // PluginDriver - helper struct to hold common utilities for driver interface diff --git a/client_plugin/drivers/vfile/kvstore/etcdops/etcdops.go b/client_plugin/drivers/vfile/kvstore/etcdops/etcdops.go index 3bb791c7b..34574ce54 100644 --- a/client_plugin/drivers/vfile/kvstore/etcdops/etcdops.go +++ b/client_plugin/drivers/vfile/kvstore/etcdops/etcdops.go @@ -31,8 +31,8 @@ import ( log "github.com/Sirupsen/logrus" etcdClient "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/clientv3/concurrency" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/vfile/dockerops" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/vfile/kvstore" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/vfile/dockerops" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/vfile/kvstore" ) /* diff --git a/client_plugin/drivers/vfile/vfile_driver.go b/client_plugin/drivers/vfile/vfile_driver.go index d3d4c86a0..0670982e7 100644 --- a/client_plugin/drivers/vfile/vfile_driver.go +++ b/client_plugin/drivers/vfile/vfile_driver.go @@ -34,14 +34,14 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/go-plugins-helpers/volume" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/utils" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/vfile/dockerops" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/vfile/kvstore" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/vfile/kvstore/etcdops" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/config" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/fs" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/plugin_utils" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/refcount" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/utils" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/vfile/dockerops" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/vfile/kvstore" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/vfile/kvstore/etcdops" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/config" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/fs" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/plugin_utils" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/refcount" ) /* Constants diff --git a/client_plugin/drivers/vmdk/vmdk_driver.go b/client_plugin/drivers/vmdk/vmdk_driver.go index 115aed52b..5f7d37eb8 100644 --- a/client_plugin/drivers/vmdk/vmdk_driver.go +++ b/client_plugin/drivers/vmdk/vmdk_driver.go @@ -33,12 +33,12 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/go-plugins-helpers/volume" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/utils" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/vmdk/vmdkops" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/config" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/fs" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/plugin_utils" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/refcount" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/utils" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/vmdk/vmdkops" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/config" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/fs" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/plugin_utils" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/refcount" ) const version = "VDVS_VERSION" diff --git a/client_plugin/drivers/vmdk/vmdkops/cmd_linux_test.go b/client_plugin/drivers/vmdk/vmdkops/cmd_linux_test.go index 419a14811..4e47ecc01 100644 --- a/client_plugin/drivers/vmdk/vmdkops/cmd_linux_test.go +++ b/client_plugin/drivers/vmdk/vmdkops/cmd_linux_test.go @@ -19,8 +19,8 @@ package vmdkops_test import ( "github.com/stretchr/testify/assert" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/vmdk/vmdkops" - testparams "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/vmdk/vmdkops" + testparams "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" "testing" ) diff --git a/client_plugin/drivers/vmdk/vmdkops/esx_vmdkcmd.go b/client_plugin/drivers/vmdk/vmdkops/esx_vmdkcmd.go index c6275f67f..9856f3599 100644 --- a/client_plugin/drivers/vmdk/vmdkops/esx_vmdkcmd.go +++ b/client_plugin/drivers/vmdk/vmdkops/esx_vmdkcmd.go @@ -129,7 +129,7 @@ func (vmdkCmd EsxVmdkCmd) Run(cmd string, name string, opts map[string]string) ( continue } if errno == syscall.ECONNRESET || errno == syscall.ETIMEDOUT { - msg += " Cannot communicate with ESX, please refer to the FAQ https://github.com/vmware/docker-volume-vsphere/wiki#faq" + msg += " Cannot communicate with ESX, please refer to the FAQ https://github.com/vmware/vsphere-storage-for-docker/wiki#faq" } } else { msg = fmt.Sprintf("Internal issue: ret != 0 but errno is not set. Cancelling operation - %s ", C.GoString(&ans.errBuf[0])) diff --git a/client_plugin/drivers/vmdk/vmdkops/mock_vmdkcmd_linux.go b/client_plugin/drivers/vmdk/vmdkops/mock_vmdkcmd_linux.go index e50e9bd60..8a17d9564 100644 --- a/client_plugin/drivers/vmdk/vmdkops/mock_vmdkcmd_linux.go +++ b/client_plugin/drivers/vmdk/vmdkops/mock_vmdkcmd_linux.go @@ -27,7 +27,7 @@ import ( "syscall" log "github.com/Sirupsen/logrus" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/fs" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/fs" ) // MockVmdkCmd struct diff --git a/client_plugin/drivers/vmdk/vmdkops/vmdkops.go b/client_plugin/drivers/vmdk/vmdkops/vmdkops.go index 60261eeb7..87b76a767 100644 --- a/client_plugin/drivers/vmdk/vmdkops/vmdkops.go +++ b/client_plugin/drivers/vmdk/vmdkops/vmdkops.go @@ -19,7 +19,7 @@ package vmdkops import ( "encoding/json" log "github.com/Sirupsen/logrus" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/fs" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/fs" ) // diff --git a/client_plugin/utils/config/config.go b/client_plugin/utils/config/config.go index 4a5930a7d..06d4932ba 100644 --- a/client_plugin/utils/config/config.go +++ b/client_plugin/utils/config/config.go @@ -27,7 +27,7 @@ import ( log "github.com/Sirupsen/logrus" "github.com/natefinch/lumberjack" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/log_formatter" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/log_formatter" ) const ( diff --git a/client_plugin/utils/config/config_linux.go b/client_plugin/utils/config/config_linux.go index a6df98cb1..1de965b74 100644 --- a/client_plugin/utils/config/config_linux.go +++ b/client_plugin/utils/config/config_linux.go @@ -18,9 +18,9 @@ const ( // Default paths - used in log init in main() and test: // DefaultVMDKPluginConfigPath is the default location of Log configuration file - DefaultVMDKPluginConfigPath = "/etc/docker-volume-vsphere.conf" + DefaultVMDKPluginConfigPath = "/etc/vsphere-storage-for-docker.conf" // DefaultVMDKPluginLogPath is the default location of log (trace) file - DefaultVMDKPluginLogPath = "/var/log/docker-volume-vsphere.log" + DefaultVMDKPluginLogPath = "/var/log/vsphere-storage-for-docker.log" // DefaultVFilePluginConfigPath is the default location of Log configuration file for vFile plugin DefaultVFilePluginConfigPath = "/etc/vfile.conf" // DefaultVFilePluginLogPath is the default location of log (trace) file for vFile plugin diff --git a/client_plugin/utils/config/config_linux_test.go b/client_plugin/utils/config/config_linux_test.go index 594cd9e60..b67175cfc 100644 --- a/client_plugin/utils/config/config_linux_test.go +++ b/client_plugin/utils/config/config_linux_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/config" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/config" ) func TestLoad(t *testing.T) { @@ -29,5 +29,5 @@ func TestLoad(t *testing.T) { assert.Equal(t, conf.MaxLogSizeMb, 10) assert.Equal(t, conf.MaxLogAgeDays, 28) assert.Equal(t, conf.MaxLogFiles, 10) - assert.Equal(t, conf.LogPath, "/var/log/docker-volume-vsphere.log") + assert.Equal(t, conf.LogPath, "/var/log/vsphere-storage-for-docker.log") } diff --git a/client_plugin/utils/config/config_windows.go b/client_plugin/utils/config/config_windows.go index 157ea59fa..60dd118c8 100644 --- a/client_plugin/utils/config/config_windows.go +++ b/client_plugin/utils/config/config_windows.go @@ -21,10 +21,10 @@ import ( var ( // DefaultVMDKPluginConfigPath is the default location of the vmdk plugin config file. - DefaultVMDKPluginConfigPath = filepath.Join(os.Getenv("PROGRAMDATA"), "docker-volume-vsphere", "docker-volume-vsphere.conf") + DefaultVMDKPluginConfigPath = filepath.Join(os.Getenv("PROGRAMDATA"), "vsphere-storage-for-docker", "vsphere-storage-for-docker.conf") // DefaultVMDKPluginLogPath is the default location of the vmdk plugin log (trace) file. - DefaultVMDKPluginLogPath = filepath.Join(os.Getenv("LOCALAPPDATA"), "docker-volume-vsphere", "logs", "docker-volume-vsphere.log") + DefaultVMDKPluginLogPath = filepath.Join(os.Getenv("LOCALAPPDATA"), "vsphere-storage-for-docker", "logs", "vsphere-storage-for-docker.log") // VMDK volumes are mounted here - MountRoot = filepath.Join(os.Getenv("LOCALAPPDATA"), "docker-volume-vsphere", "mounts") + MountRoot = filepath.Join(os.Getenv("LOCALAPPDATA"), "vsphere-storage-for-docker", "mounts") ) diff --git a/client_plugin/utils/config/config_windows_test.go b/client_plugin/utils/config/config_windows_test.go index 2ce8182c5..3b51bcd8f 100644 --- a/client_plugin/utils/config/config_windows_test.go +++ b/client_plugin/utils/config/config_windows_test.go @@ -16,12 +16,12 @@ package config_test import ( "github.com/stretchr/testify/assert" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/config" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/config" "os" "testing" ) func TestWindowsPath(t *testing.T) { - assert.Equal(t, config.DefaultConfigPath, os.Getenv("PROGRAMDATA")+`\docker-volume-vsphere\docker-volume-vsphere.conf`) - assert.Equal(t, config.DefaultLogPath, os.Getenv("LOCALAPPDATA")+`\docker-volume-vsphere\logs\docker-volume-vsphere.log`) + assert.Equal(t, config.DefaultConfigPath, os.Getenv("PROGRAMDATA")+`\vsphere-storage-for-docker\vsphere-storage-for-docker.conf`) + assert.Equal(t, config.DefaultLogPath, os.Getenv("LOCALAPPDATA")+`\vsphere-storage-for-docker\logs\vsphere-storage-for-docker.log`) } diff --git a/client_plugin/utils/fs/device_watcher_windows.go b/client_plugin/utils/fs/device_watcher_windows.go index 14d0c72a0..01447f364 100644 --- a/client_plugin/utils/fs/device_watcher_windows.go +++ b/client_plugin/utils/fs/device_watcher_windows.go @@ -22,7 +22,7 @@ import ( "fmt" log "github.com/Sirupsen/logrus" - ps "github.com/vmware/docker-volume-vsphere/client_plugin/utils/powershell" + ps "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/powershell" ) const ( diff --git a/client_plugin/utils/fs/fs_windows.go b/client_plugin/utils/fs/fs_windows.go index 75a902e54..274784a0d 100644 --- a/client_plugin/utils/fs/fs_windows.go +++ b/client_plugin/utils/fs/fs_windows.go @@ -24,7 +24,7 @@ import ( "time" log "github.com/Sirupsen/logrus" - ps "github.com/vmware/docker-volume-vsphere/client_plugin/utils/powershell" + ps "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/powershell" ) const ( @@ -83,7 +83,7 @@ const ( // mountListScript is a PowerShell script that lists disk numbers and their access paths. // Sample output: // 0 \\?\Volume{1cca2a47-0000-0000-0000-100000000000}\ - // 1 C:\Users\Administrator\AppData\Local\docker-volume-vsphere\mounts\volName\ \\?\Volume{145c5662-0000-0000-0000-100000000000}\ + // 1 C:\Users\Administrator\AppData\Local\vsphere-storage-for-docker\mounts\volName\ \\?\Volume{145c5662-0000-0000-0000-100000000000}\ mountListScript = ` Get-Partition | ForEach-Object { Write-Host $_.DiskNumber, $_.AccessPaths }; diff --git a/client_plugin/utils/plugin_server/plugin_server.go b/client_plugin/utils/plugin_server/plugin_server.go index 2e0146d66..5f5d21ae6 100644 --- a/client_plugin/utils/plugin_server/plugin_server.go +++ b/client_plugin/utils/plugin_server/plugin_server.go @@ -21,7 +21,7 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/go-plugins-helpers/volume" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/codecov" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/codecov" ) // PluginServer responds to HTTP requests from Docker. diff --git a/client_plugin/utils/plugin_server/plugin_server_linux.go b/client_plugin/utils/plugin_server/plugin_server_linux.go index 308647cb9..036ae8271 100644 --- a/client_plugin/utils/plugin_server/plugin_server_linux.go +++ b/client_plugin/utils/plugin_server/plugin_server_linux.go @@ -23,7 +23,7 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/go-plugins-helpers/volume" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/config" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/config" ) // Unix sock for the plugin is maintained here diff --git a/client_plugin/utils/plugin_utils/plugin_utils.go b/client_plugin/utils/plugin_utils/plugin_utils.go index d3a3a12e1..b88dce83a 100644 --- a/client_plugin/utils/plugin_utils/plugin_utils.go +++ b/client_plugin/utils/plugin_utils/plugin_utils.go @@ -21,8 +21,8 @@ import ( "strings" log "github.com/Sirupsen/logrus" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/fs" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/fs" ) const ( diff --git a/client_plugin/utils/refcount/refcnt.go b/client_plugin/utils/refcount/refcnt.go index bd72d4f6a..d0e68024b 100644 --- a/client_plugin/utils/refcount/refcnt.go +++ b/client_plugin/utils/refcount/refcnt.go @@ -44,7 +44,7 @@ // After refcount discovery, results are compared to fs.GetMountInfo() content. // // We rely on all plugin mounts being in /mnt/vmdk/ for Linux and -// C:\Users\Administrator\AppData\Local\docker-volume-vsphere\mounts\ +// C:\Users\Administrator\AppData\Local\vsphere-storage-for-docker\mounts\ // on Windows, and will unmount stuff there at will - this place SHOULD NOT be // used for manual mounts. // @@ -81,9 +81,9 @@ import ( "github.com/docker/engine-api/client" "github.com/docker/engine-api/types" "github.com/docker/engine-api/types/filters" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/fs" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/plugin_utils" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/fs" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/plugin_utils" "golang.org/x/net/context" ) diff --git a/client_plugin/vfile_plugin/main.go b/client_plugin/vfile_plugin/main.go index cd0c71cb8..b7f68c6d9 100644 --- a/client_plugin/vfile_plugin/main.go +++ b/client_plugin/vfile_plugin/main.go @@ -22,12 +22,12 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/go-plugins-helpers/volume" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/vfile" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/config" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/plugin_server" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/vfile" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/config" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/plugin_server" ) -// main for docker-volume-vsphere +// main for vsphere-storage-for-docker // Parses flags, initializes and mounts refcounters and finally initializes the server. func main() { var driver volume.Driver diff --git a/client_plugin/vmdk_plugin/main.go b/client_plugin/vmdk_plugin/main.go index 7636f7cc5..f4c996946 100644 --- a/client_plugin/vmdk_plugin/main.go +++ b/client_plugin/vmdk_plugin/main.go @@ -22,13 +22,13 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/go-plugins-helpers/volume" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/photon" - "github.com/vmware/docker-volume-vsphere/client_plugin/drivers/vmdk" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/config" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/plugin_server" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/photon" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/drivers/vmdk" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/config" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/plugin_server" ) -// main for docker-volume-vsphere +// main for vsphere-storage-for-docker func main() { startDaemon() } diff --git a/client_plugin/vmdk_plugin/sanity_test.go b/client_plugin/vmdk_plugin/sanity_test.go index 3cbbf1f97..4c0d059b7 100644 --- a/client_plugin/vmdk_plugin/sanity_test.go +++ b/client_plugin/vmdk_plugin/sanity_test.go @@ -33,16 +33,16 @@ import ( "github.com/docker/engine-api/types/container" "github.com/docker/engine-api/types/filters" "github.com/docker/engine-api/types/strslice" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/config" - "github.com/vmware/docker-volume-vsphere/client_plugin/utils/refcount" - testutil "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/config" + "github.com/vmware/vsphere-storage-for-docker/client_plugin/utils/refcount" + testutil "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" "golang.org/x/net/context" ) const ( defaultMountLocation = "/mnt/testvol" // tests are often run under regular account and have no access to /var/log - defaultTestLogPath = "/tmp/test-docker-volume-vsphere.log" + defaultTestLogPath = "/tmp/test-vsphere-storage-for-docker.log" // Number of volumes per client for parallel tests ) diff --git a/docs/README.md b/docs/README.md index 5603fcd62..9359c30bc 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,18 +2,18 @@ The documentation for the next release goes here. Please refer -[mkdocs.yml](https://github.com/vmware/docker-volume-vsphere/blob/master/mkdocs.yml) -for the layout of the documentation. Only files covered in [index.md](https://github.com/vmware/docker-volume-vsphere/blob/master/mkdocs.yml) will get published. +[mkdocs.yml](https://github.com/vmware/vsphere-storage-for-docker/blob/master/mkdocs.yml) +for the layout of the documentation. Only files covered in [index.md](https://github.com/vmware/vsphere-storage-for-docker/blob/master/mkdocs.yml) will get published. Documentation intended for publishing should go into the misc folder. ## Updating documentation Please read [CONTRIBUTING.md]( -https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md) for +https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md) for best practice for editing and publishing documentation. ## Layout The documentation layout is as follows -- [User guide, CLI documentation and blogs](https://github.com/vmware/docker-volume-vsphere/tree/master/docs/external) -- [Feature Overview](https://github.com/vmware/docker-volume-vsphere/tree/master/docs/internal) -- [Project related images](https://github.com/vmware/docker-volume-vsphere/tree/master/docs/misc) \ No newline at end of file +- [User guide, CLI documentation and blogs](https://github.com/vmware/vsphere-storage-for-docker/tree/master/docs/external) +- [Feature Overview](https://github.com/vmware/vsphere-storage-for-docker/tree/master/docs/internal) +- [Project related images](https://github.com/vmware/vsphere-storage-for-docker/tree/master/docs/misc) \ No newline at end of file diff --git a/docs/external/Interop.md b/docs/external/Interop.md index 301b846f0..d0419365e 100644 --- a/docs/external/Interop.md +++ b/docs/external/Interop.md @@ -6,28 +6,28 @@ The vDVS plugin works well with all vSphere features and deviations if any are a SvMotion/XvMotion is not supported for VMs that use vDVS volumes. -- SvMotion/XvMotion causes vDVS volumes to be migrated out of the datastore location and hence causing the plugin to lose access to the volume. [#1618](https://github.com/vmware/docker-volume-vsphere/issues/1618) +- SvMotion/XvMotion causes vDVS volumes to be migrated out of the datastore location and hence causing the plugin to lose access to the volume. [#1618](https://github.com/vmware/vsphere-storage-for-docker/issues/1618) **Storage DRS** -Storage DRS is not supported for VMs that use vDVS volumes. +Storage DRS is not supported for VMs that use vDVS volumes. -- Volume creation succeeds on a datastore which is in maintenance mode. Datastore maintenance mode is a VC feature and ESX is not aware of if any datastore is put in maintenance mode. [#1651](https://github.com/vmware/docker-volume-vsphere/issues/1651) -- Specifying "Datastore Cluster" name during volume creation is not supported. Datastore clusters (as a part of Storage DRS) is a VC feature and not available on an individual ESX. [#556](https://github.com/vmware/docker-volume-vsphere/issues/556) +- Volume creation succeeds on a datastore which is in maintenance mode. Datastore maintenance mode is a VC feature and ESX is not aware of if any datastore is put in maintenance mode. [#1651](https://github.com/vmware/vsphere-storage-for-docker/issues/1651) +- Specifying "Datastore Cluster" name during volume creation is not supported. Datastore clusters (as a part of Storage DRS) is a VC feature and not available on an individual ESX. [#556](https://github.com/vmware/vsphere-storage-for-docker/issues/556) - Storage DRS doesn't apply for VMs that have independent disks attached to it. **Snapshot** Creating snapshots of a VM which has containers running is not supported. -- If a container is running and a snapshot is taken then if the container exits, the volume is not detached. VC shows an error that the volume is part of a snapshot and hence can't be removed from the VM config. For this reason, snapshotting a VM after starting one or more containers isn't supported as it leaves the volume attached to the VM. [#1649](https://github.com/vmware/docker-volume-vsphere/issues/1649) +- If a container is running and a snapshot is taken then if the container exits, the volume is not detached. VC shows an error that the volume is part of a snapshot and hence can't be removed from the VM config. For this reason, snapshotting a VM after starting one or more containers isn't supported as it leaves the volume attached to the VM. [#1649](https://github.com/vmware/vsphere-storage-for-docker/issues/1649) **Site Recovery Manager[SRM]** User created vmgroup is not supported with SRM. -- SRM does not replicate the vmgroup configuration to the recovery site. As a result, after disaster recovery finishes, all VMs that were part of user created vmgroup will lose access to volumes of user created vmgroup. Those VMs now become part of `_DEFAULT` vmgroup and will have access to volumes of `_DEFAULT` vmgroup - in short, VMs lose the volumes that were part of user created vmgroup and gain access to volumes of `_DEFAULT vmgroup`. [#1786](https://github.com/vmware/docker-volume-vsphere/issues/1786) +- SRM does not replicate the vmgroup configuration to the recovery site. As a result, after disaster recovery finishes, all VMs that were part of user created vmgroup will lose access to volumes of user created vmgroup. Those VMs now become part of `_DEFAULT` vmgroup and will have access to volumes of `_DEFAULT` vmgroup - in short, VMs lose the volumes that were part of user created vmgroup and gain access to volumes of `_DEFAULT vmgroup`. [#1786](https://github.com/vmware/vsphere-storage-for-docker/issues/1786) **Virtual Volumes(VVol)** -- All features of vDVS are supported with Virtual Volumes(VVol) except clone volume. Cloning a volume to create a new volume on a VVol datastore is not supported currently. [#1998] (https://github.com/vmware/docker-volume-vsphere/issues/1998) \ No newline at end of file +- All features of vDVS are supported with Virtual Volumes(VVol) except clone volume. Cloning a volume to create a new volume on a VVol datastore is not supported currently. [#1998] (https://github.com/vmware/vsphere-storage-for-docker/issues/1998) \ No newline at end of file diff --git a/docs/external/admin-cli.md b/docs/external/admin-cli.md index a8a9ea4d4..9a0b4da66 100644 --- a/docs/external/admin-cli.md +++ b/docs/external/admin-cli.md @@ -774,7 +774,7 @@ by one or more virtual disks. The ability to list which virtual disks are using a specific storage policy, change storage policies for a virtual disk, and reset virtual disks to the default storage policy is a necessary -enhancement tracked [here](https://github.com/vmware/docker-volume-vsphere/issues/577). +enhancement tracked [here](https://github.com/vmware/vsphere-storage-for-docker/issues/577). ``` [root@localhost:~] esxcli storage guestvol policy rm --name=some-policy diff --git a/docs/external/configuration.md b/docs/external/configuration.md index b4c8d0319..39f967db3 100644 --- a/docs/external/configuration.md +++ b/docs/external/configuration.md @@ -52,7 +52,7 @@ The configurations used by a driver while performing operations are read from a ## Plugin Configuration -The configuration for Docker volume plugin can be provided via a JSON formatted configuration file and on the command line (only when the plugin is manually executed vs. as a managed plugin by docker). The plugin can be provided the driver type (which must be set to be "vsphere" (default)), log configuration and the group-id used to create the plugin socket file. The log configuration includes the log level and the location where the log file is located. The configuration file is by default located at /etc/docker-volume-vsphere.conf. The configuration file to use can also be specified by providing the --config option and the full path to the file. Finally the parameters passed on the commandline override those read from the configuration file. +The configuration for Docker volume plugin can be provided via a JSON formatted configuration file and on the command line (only when the plugin is manually executed vs. as a managed plugin by docker). The plugin can be provided the driver type (which must be set to be "vsphere" (default)), log configuration and the group-id used to create the plugin socket file. The log configuration includes the log level and the location where the log file is located. The configuration file is by default located at /etc/vsphere-storage-for-docker.conf. The configuration file to use can also be specified by providing the --config option and the full path to the file. Finally the parameters passed on the commandline override those read from the configuration file. ``` { @@ -60,7 +60,7 @@ The configuration for Docker volume plugin can be provided via a JSON formatted "MaxLogAgeDays": 28, "MaxLogFiles": 10, "MaxLogSizeMb": 10, - "LogPath": "/var/log/docker-volume-vsphere.log", + "LogPath": "/var/log/vsphere-storage-for-docker.log", "LogLevel": "info", "GroupID": "root" (default or alternatively use "docker" as the group ID) } diff --git a/docs/external/contactus.md b/docs/external/contactus.md index 3719eff5c..af6388dcc 100644 --- a/docs/external/contactus.md +++ b/docs/external/contactus.md @@ -6,4 +6,4 @@ You can reach us via: * Email us at [hatchway@vmware.com](hatchway@vmware.com) * Ping us on [Docker channel](https://vmwarecode.slack.com/messages/docker/) on VMware Code slack -* Report issues and feature request on [Github](https://github.com/vmware/docker-volume-vsphere/issues) +* Report issues and feature request on [Github](https://github.com/vmware/vsphere-storage-for-docker/issues) diff --git a/docs/external/docker-compatibility.md b/docs/external/docker-compatibility.md index 1865ab249..4ec30433f 100644 --- a/docs/external/docker-compatibility.md +++ b/docs/external/docker-compatibility.md @@ -10,16 +10,16 @@ vDVS is a docker certified plugin and it integrates with Docker volume plugin fr ## Docker Volume -vDVS plugin is fully compatible with docker volume command, you can find details and working example in [Management of docker volumes](http://vmware.github.io/docker-volume-vsphere/documentation/docker-volume-cli.html) +vDVS plugin is fully compatible with docker volume command, you can find details and working example in [Management of docker volumes](http://vmware.github.io/vsphere-storage-for-docker/documentation/docker-volume-cli.html) ## Docker-engine in Swarm mode -vDVS can be used with Docker Engine in swarm mode to build highly available and fault tolerant application with stateful data requirements. You can find an example and details on page [HA DB in docker swarm mode](http://vmware.github.io/docker-volume-vsphere/documentation/demo-ha-swarm.html) +vDVS can be used with Docker Engine in swarm mode to build highly available and fault tolerant application with stateful data requirements. You can find an example and details on page [HA DB in docker swarm mode](http://vmware.github.io/vsphere-storage-for-docker/documentation/demo-ha-swarm.html) ## Docker Service -Docker service is used to deploy applications that can run on docker engine in swarm mode in a distributed cluster. A docker service is typically part of a larger set of applications for example you might deploy an application server and database as a service. vDVS is fully compatible with docker service command and you can see working examples and details on [Docker Service with vSphere volumes page](http://vmware.github.io/docker-volume-vsphere/documentation/docker-service.html) +Docker service is used to deploy applications that can run on docker engine in swarm mode in a distributed cluster. A docker service is typically part of a larger set of applications for example you might deploy an application server and database as a service. vDVS is fully compatible with docker service command and you can see working examples and details on [Docker Service with vSphere volumes page](http://vmware.github.io/vsphere-storage-for-docker/documentation/docker-service.html) ## Docker Stack -A stack in docker terms is a collection of services. A stack can be used to define a complete application composed of multiple services. Docker stack enables defining dependencies between services, configuration parameters in one place for a complete application. vDVS is fully compatible with docker stack commands and working examples and details can be found [Docker Service with vSphere volumes page](http://vmware.github.io/docker-volume-vsphere/documentation/docker-stacks.html) \ No newline at end of file +A stack in docker terms is a collection of services. A stack can be used to define a complete application composed of multiple services. Docker stack enables defining dependencies between services, configuration parameters in one place for a complete application. vDVS is fully compatible with docker stack commands and working examples and details can be found [Docker Service with vSphere volumes page](http://vmware.github.io/vsphere-storage-for-docker/documentation/docker-stacks.html) \ No newline at end of file diff --git a/docs/external/docker-volume-cli.md b/docs/external/docker-volume-cli.md index 60720cc1b..2b3a51d1e 100644 --- a/docs/external/docker-volume-cli.md +++ b/docs/external/docker-volume-cli.md @@ -30,7 +30,7 @@ docker volume create --driver=vsphere --name=MyVolume -o size=10gb -o vsan-polic ``` -You can find more details about policy management using vSAN in page [Storage policy based management](http://vmware.github.io/docker-volume-vsphere/documentation/policy-based-management.html) +You can find more details about policy management using vSAN in page [Storage policy based management](http://vmware.github.io/vsphere-storage-for-docker/documentation/policy-based-management.html) ##### Disk Format (diskformat) The docker volumes are backed by VMDK and VMDKs support multiple [types](https://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1022242). At the moment following types of VMDKs are supported: diff --git a/docs/external/faq.md b/docs/external/faq.md index cd2fc07b3..df5fe61b8 100644 --- a/docs/external/faq.md +++ b/docs/external/faq.md @@ -5,16 +5,16 @@ title: FAQs ## General ### Where do I get the binaries? What about the source? -Please look at [GitHub Releases](https://github.com/vmware/docker-volume-vsphere/releases) for binaries. Github releases allow downloading of source for a release in addition to git clone. +Please look at [GitHub Releases](https://github.com/vmware/vsphere-storage-for-docker/releases) for binaries. Github releases allow downloading of source for a release in addition to git clone. ### How to install and use the driver? -Please follow the instructions at [installation-on-esxi](http://vmware.github.io/docker-volume-vsphere/documentation/install.html#installation-on-esxi). +Please follow the instructions at [installation-on-esxi](http://vmware.github.io/vsphere-storage-for-docker/documentation/install.html#installation-on-esxi). ### How do I run the setup on my laptop? -Follow the [guide on the wiki](https://github.com/vmware/docker-volume-vsphere/wiki/Using-laptop-for-running-the-entire-stack) +Follow the [guide on the wiki](https://github.com/vmware/vsphere-storage-for-docker/wiki/Using-laptop-for-running-the-entire-stack) ### How do I bind a volume to a particular container host? -This can be achieved via [Tenancy](http://vmware.github.io/docker-volume-vsphere/documentation/tenancy.html). +This can be achieved via [Tenancy](http://vmware.github.io/vsphere-storage-for-docker/documentation/tenancy.html). ### How do I mount vSphere volume when there are volumes with the same name created on the different datastores? If there are volumes with the same name on different datastores then use the long name (e.g. `myVolume@vsanDatastore`). Let's take an example as shown below, full volume name should be passed while mounting the volume. @@ -36,10 +36,10 @@ Edge release: A monthly release with new features and bug fixes. Stable release: A quarterly release with reliable/stable updates. -Please refer [release convention](https://github.com/vmware/docker-volume-vsphere/blob/master/CONTRIBUTING.md#release-naming-convention) for more details. +Please refer [release convention](https://github.com/vmware/vsphere-storage-for-docker/blob/master/CONTRIBUTING.md#release-naming-convention) for more details. ### Can I use the full volume like "vol@datastore" in compose file with vDVS? -Yes, it is supported starting from Docker 17.09-ce release and compose 3.4. Please refer to this [example](https://github.com/vmware/docker-volume-vsphere/blob/master/docs/external/docker-stacks.md). +Yes, it is supported starting from Docker 17.09-ce release and compose 3.4. Please refer to this [example](https://github.com/vmware/vsphere-storage-for-docker/blob/master/docs/external/docker-stacks.md). ## Troubleshooting @@ -54,23 +54,23 @@ Additional reading for differences between VMware tools and open vm tools: * [Open-VM-Tools (OVT): The Future Of VMware Tools For Linux](http://blogs.vmware.com/vsphere/2015/09/open-vm-tools-ovt-the-future-of-vmware-tools-for-linux.html) * [VMware Tools vs Open VM Tools](http://superuser.com/questions/270112/open-vm-tools-vs-vmware-tools) -#### I see "connection reset by peer (errno=104)" in the [service's logs](https://github.com/vmware/docker-volume-vsphere#logging), what is the cause? +#### I see "connection reset by peer (errno=104)" in the [service's logs](https://github.com/vmware/vsphere-storage-for-docker#logging), what is the cause? 104 is a standard linux error (```#define ECONNRESET 104 /* Connection reset by peer */```) It occurs if the Docker volume service cannot communicate to the ESX back end. This can happen if: * VMCI and/or vSock kernel modules are not loaded or the kernel does not support VMCI and vSock. Please read "What is VMCI and vSock and why is it needed?" above. - * ESX service is not running. ```/etc/init.d/vmdk-opsd status```. Check [ESX Logs](https://github.com/vmware/docker-volume-vsphere#logging) - * ESX service and the docker volume service are not communicating on the same port. ```ps -c | grep vmdk #On ESX``` and ```ps aux| grep docker-volume-vsphere # On VM``` check the port param passed in and make sure they are the same + * ESX service is not running. ```/etc/init.d/vmdk-opsd status```. Check [ESX Logs](https://github.com/vmware/vsphere-storage-for-docker#logging) + * ESX service and the docker volume service are not communicating on the same port. ```ps -c | grep vmdk #On ESX``` and ```ps aux| grep vsphere-storage-for-docker # On VM``` check the port param passed in and make sure they are the same -#### I see "address family not supported by protocol (errno=97)" in the [service's logs](https://github.com/vmware/docker-volume-vsphere#logging), what is the cause? +#### I see "address family not supported by protocol (errno=97)" in the [service's logs](https://github.com/vmware/vsphere-storage-for-docker#logging), what is the cause? 97 is a standard linux error (```#define EAFNOSUPPORT 97 /* Address family not supported by protocol */```) -It occurs if the linux kernel does not know about the AF family used for VMCI communication. Please read ["What is VMCI and vSock and why is it needed?"](https://vmware.github.io/docker-volume-vsphere/user-guide/faq/#what-is-vmci-and-vsock-and-why-is-it-needed) above. +It occurs if the linux kernel does not know about the AF family used for VMCI communication. Please read ["What is VMCI and vSock and why is it needed?"](https://vmware.github.io/vsphere-storage-for-docker/user-guide/faq/#what-is-vmci-and-vsock-and-why-is-it-needed) above. #### I see "plugin not found" error message in the Docker daemon logs, what is the cause? This is the limitation of docker and being tracked at [issue#34545](https://github.com/moby/moby/issues/34545). -Docker maintains a unique plugin ID that's assigned when the plugin is installed. Once assigned the ID remains with the plugin till its removed. All volumes that were created via the plugin will remain inaccessible if the plugin is removed. The correct way to install updates to the plugin is to upgrade the plugin using `docker plugin upgrade` as mentioned at [user guide](http://vmware.github.io/docker-volume-vsphere/documentation/install.html#upgrade-instructions). +Docker maintains a unique plugin ID that's assigned when the plugin is installed. Once assigned the ID remains with the plugin till its removed. All volumes that were created via the plugin will remain inaccessible if the plugin is removed. The correct way to install updates to the plugin is to upgrade the plugin using `docker plugin upgrade` as mentioned at [user guide](http://vmware.github.io/vsphere-storage-for-docker/documentation/install.html#upgrade-instructions). #### Volume remains attached to the VM after upgrading vDVS ESX driver If the container using volumes exits during the upgrade of ESX driver (i.e. after vib remove but before vib install), the volumes may remain attached to VM. In such a case, please disable and then enable (restart) the volume plugin to ensure volumes are properly detached. @@ -90,7 +90,7 @@ systemctl restart docker #### I'm not able to create volume and I see "VolumeDriver.Create: Device not found" error -From 0.19 release of vDVS, the plugin has to have a VIB that's at least 0.19 or later. [#2023](https://github.com/vmware/docker-volume-vsphere/issues/2023) +From 0.19 release of vDVS, the plugin has to have a VIB that's at least 0.19 or later. [#2023](https://github.com/vmware/vsphere-storage-for-docker/issues/2023) Ideally it is better if you always upgrade both the plugin and the VIB to matching versions. ## Upgrade to version 0.10 (Dec 2016) release diff --git a/docs/external/index.md b/docs/external/index.md index 75433e111..03b2e1b85 100644 --- a/docs/external/index.md +++ b/docs/external/index.md @@ -3,9 +3,9 @@ title: vSphere Docker Volume Service --- ![Image](images/docker-cert.jpeg) -## Introduction +## Introduction -Containers have changed the way applications are packaged and deployed. Not only containers are efficient from infrastructure utilization point of view, they also provide strong isolation between process on same host. They are lightweight and once packaged can run anywhere. Docker is the most commonly used container runtime technology and this user guide outlines how vSphere is compatible with Docker ecosystem. +Containers have changed the way applications are packaged and deployed. Not only containers are efficient from infrastructure utilization point of view, they also provide strong isolation between process on same host. They are lightweight and once packaged can run anywhere. Docker is the most commonly used container runtime technology and this user guide outlines how vSphere is compatible with Docker ecosystem. ## Persistent Storage in Container World @@ -24,13 +24,13 @@ vSphere Docker Volume Service technology enables running stateful containers bac Some of key features of vDVS are: -* **Enterprise class storage**: You can use vDVS with proven enterprise class technologies such as VMWare vSAN, VMFS, NFS etc. +* **Enterprise class storage**: You can use vDVS with proven enterprise class technologies such as VMWare vSAN, VMFS, NFS etc. * **Security & RBAC**: The vSphere admin can manage the security and access controls on the underlying hosts on a set of hosts or data centers. * **Simple to use**: It is as easy to use as other docker APIs and from end user’s perspective there is no need for additional configuration etc. * **Docker Compatibility**: vSphere Docker Volume Service is 100% Docker compatible and integrates with Docker Swarm to extend High Availability feature provided by Swarm * **Storage Policy Management**: vSphere Docker Volume Service brings vSphere's advanced storage feature like policy management to Docker ecosystem. -This service is integrated with [Docker Volume Plugin framework](https://docs.docker.com/engine/extend/plugins_volume/). It does not need credential management or configuration management. +This service is integrated with [Docker Volume Plugin framework](https://docs.docker.com/engine/extend/plugins_volume/). It does not need credential management or configuration management. vDVS abstracts underlying enterprise class storage and makes it available as docker volumes to a cluster of hosts running in vSphere environment @@ -42,8 +42,8 @@ Furthermore, vFile volume plugin comes with high availability, scalability, and Same as vDVS, vFile volume plugin is also integrated with [Docker Volume Plugin framework](https://docs.docker.com/engine/extend/plugins_volume/). -More details about the usage of vFile can be found at [vFile userguide](http://vmware.github.io/docker-volume-vsphere/documentation/vfile-plugin.html). +More details about the usage of vFile can be found at [vFile userguide](http://vmware.github.io/vsphere-storage-for-docker/documentation/vfile-plugin.html). ## Documentation Version -The documentation here is for the latest release. The current master documentation can be found in jekyll/markdown format in [jekyll-docs folder](https://github.com/vmware/docker-volume-vsphere/tree/gh-pages/jekyll-docs). For older releases, browse to [releases](https://github.com/vmware/docker-volume-vsphere/releases) select the release, click on the tag for the release and browse the docs folder. +The documentation here is for the latest release. The current master documentation can be found in jekyll/markdown format in [jekyll-docs folder](https://github.com/vmware/vsphere-storage-for-docker/tree/gh-pages/jekyll-docs). For older releases, browse to [releases](https://github.com/vmware/vsphere-storage-for-docker/releases) select the release, click on the tag for the release and browse the docs folder. diff --git a/docs/external/install.md b/docs/external/install.md index 19002c488..b955686d3 100644 --- a/docs/external/install.md +++ b/docs/external/install.md @@ -61,12 +61,12 @@ Note: We have discontinued the DEB/RPM based installation of the Docker plugin. * **To install the plugin** ``` -~# docker plugin install --grant-all-permissions --alias vsphere vmware/docker-volume-vsphere:latest -latest: Pulling from vmware/docker-volume-vsphere +~# docker plugin install --grant-all-permissions --alias vsphere vmware/vsphere-storage-for-docker:latest +latest: Pulling from vmware/vsphere-storage-for-docker f07d34084e57: Download complete Digest: sha256:e1028b8570f37f374e8987d1a5b418e3c591e2cad155cc3b750e5e5ac643fb31 -Status: Downloaded newer image for vmware/docker-volume-vsphere:latest -Installed plugin vmware/docker-volume-vsphere:latest +Status: Downloaded newer image for vmware/vsphere-storage-for-docker:latest +Installed plugin vmware/vsphere-storage-for-docker:latest ``` * **To verify that it was installed and is listed** @@ -111,7 +111,7 @@ First, start an instance of PowerShell with the "Run as administrator" option. * **To download the plugin installer** ``` -PS C:\> Invoke-WebRequest -Uri https://raw.githubusercontent.com/vmware/docker-volume-vsphere/master/install-vdvs.ps1 -Out install-vdvs.ps1 +PS C:\> Invoke-WebRequest -Uri https://raw.githubusercontent.com/vmware/vsphere-storage-for-docker/master/install-vdvs.ps1 -Out install-vdvs.ps1 ``` * **To install the plugin** @@ -123,10 +123,10 @@ PS C:\> .\install-vdvs.ps1 For example, the vSphere Storage for Docker 0.16 developer preview binary could be installed as shown below. ``` -PS C:\> .\install-vdvs.ps1 https://bintray.com/vmware/vDVS/download_file?file_path=docker-volume-vsphere_windows_developer-preview.zip -Downloading from https://bintray.com/vmware/vDVS/download_file?file_path=docker-volume-vsphere_windows_developer-preview.zip... -Extracting docker-volume-vsphere.zip into C:\Program Files\VMware\vmdkops... -Deleting docker-volume-vsphere.zip... +PS C:\> .\install-vdvs.ps1 https://bintray.com/vmware/vDVS/download_file?file_path=vsphere-storage-for-docker_windows_developer-preview.zip +Downloading from https://bintray.com/vmware/vDVS/download_file?file_path=vsphere-storage-for-docker_windows_developer-preview.zip... +Extracting vsphere-storage-for-docker.zip into C:\Program Files\VMware\vmdkops... +Deleting vsphere-storage-for-docker.zip... Installing Windows service vdvs from C:\Program Files\VMware\vmdkops\vdvs.exe... Status Name DisplayName @@ -175,7 +175,7 @@ Upgrade of volume managed plugin or ESX driver has no impact on data path and ru #1. Uninstall VIB (driver) esxcli software vib remove -n esx-vmdkops-service -#2. Download and install the latest VIB from the docker-volume-vsphere release page +#2. Download and install the latest VIB from the vsphere-storage-for-docker release page esxcli software vib install -v /.vib #3. Verify the status @@ -189,8 +189,8 @@ esxcli storage guestvol status #1. Disable the managed plugin from the docker host docker plugin disable -f vsphere -#2. Upgrade the latest release of docker-volume-vsphere managed plugin -docker plugin upgrade --grant-all-permissions vsphere:latest vmware/docker-volume-vsphere:latest +#2. Upgrade the latest release of vsphere-storage-for-docker managed plugin +docker plugin upgrade --grant-all-permissions vsphere:latest vmware/vsphere-storage-for-docker:latest #3. Enable the managed plugin from the docker host docker plugin enable vsphere @@ -203,7 +203,7 @@ docker plugin enable vsphere #1. Uninstall VIB (driver) esxcli software vib remove -n esx-vmdkops-service -#2. Download and install the required VIB from the docker-volume-vsphere release page +#2. Download and install the required VIB from the vsphere-storage-for-docker release page esxcli software vib install -v /.vib #3. Verify the status @@ -217,8 +217,8 @@ esxcli storage guestvol status #1. Disable the managed plugin from the docker host docker plugin disable -f vsphere -#2. Using docker plugin upgrade, you can downgrade to required release of docker-volume-vsphere managed plugin -docker plugin upgrade --grant-all-permissions vsphere:latest vmware/docker-volume-vsphere: +#2. Using docker plugin upgrade, you can downgrade to required release of vsphere-storage-for-docker managed plugin +docker plugin upgrade --grant-all-permissions vsphere:latest vmware/vsphere-storage-for-docker: #3. Enable the managed plugin from the docker host docker plugin enable vsphere diff --git a/docs/external/known-issues.md b/docs/external/known-issues.md index ea1de60b1..4b4353709 100644 --- a/docs/external/known-issues.md +++ b/docs/external/known-issues.md @@ -2,16 +2,16 @@ title: Known Issues --- -This section lists the major known issues with vSphere Docker Volume Service. For a complete list of issues, please check our Github issues(https://github.com/vmware/docker-volume-vsphere/issues) page. If you notice an issue not listed in Github issues page, please do file a bug on the [Github repo](https://github.com/vmware/docker-volume-vsphere/issues) +This section lists the major known issues with vSphere Docker Volume Service. For a complete list of issues, please check our Github issues(https://github.com/vmware/vsphere-storage-for-docker/issues) page. If you notice an issue not listed in Github issues page, please do file a bug on the [Github repo](https://github.com/vmware/vsphere-storage-for-docker/issues) -- Volume metadata file got deleted while removing volume from VM(placed on Esx2) which is in use by another VM(placed on Esx1) [#1191](https://github.com/vmware/docker-volume-vsphere/issues/1191). It's an ESX issue and will be available in the next vSphere release. -- Currently "vmdk-opsd stop" just stops (exits) the service forcefully. If there are operations in flight it could kill them in the middle of execution. This can potentially create inconsistencies in VM attachement, KV files or auth-db. [#1073](https://github.com/vmware/docker-volume-vsphere/issues/1073) +- Volume metadata file got deleted while removing volume from VM(placed on Esx2) which is in use by another VM(placed on Esx1) [#1191](https://github.com/vmware/vsphere-storage-for-docker/issues/1191). It's an ESX issue and will be available in the next vSphere release. +- Currently "vmdk-opsd stop" just stops (exits) the service forcefully. If there are operations in flight it could kill them in the middle of execution. This can potentially create inconsistencies in VM attachement, KV files or auth-db. [#1073](https://github.com/vmware/vsphere-storage-for-docker/issues/1073) - vDVS volume that has already been created cannot be resized or it's size cannot be updated. ## Windows Plugin Known issues -- Volume creation initiated by Windows Container Hosts is slow. [#2010](https://github.com/vmware/docker-volume-vsphere/issues/2010) -- For Windows plugin, if the volume is mounted using its short name then subsequent mount requests for the same volume should only use short volume name. Same thing applies for long volume names. Otherwise user will run into the issue [#2006](https://github.com/vmware/docker-volume-vsphere/issues/2006) +- Volume creation initiated by Windows Container Hosts is slow. [#2010](https://github.com/vmware/vsphere-storage-for-docker/issues/2010) +- For Windows plugin, if the volume is mounted using its short name then subsequent mount requests for the same volume should only use short volume name. Same thing applies for long volume names. Otherwise user will run into the issue [#2006](https://github.com/vmware/vsphere-storage-for-docker/issues/2006) ## Known Differences Between Linux And Windows Plugin - Docker, by default, converts volume names to lower-case on Windows. Therefore, volume operations involving case-sensitive names will always be handled in lower case. \ No newline at end of file diff --git a/docs/external/vfile-plugin.md b/docs/external/vfile-plugin.md index 0835240ec..5e37baca6 100644 --- a/docs/external/vfile-plugin.md +++ b/docs/external/vfile-plugin.md @@ -17,11 +17,11 @@ same Docker Swarm cluster for the base volume plugin service such as vDVS, with along with high availability, scalability, and load balancing support. ## Detailed documentation -Detailed documentation can be found on our [GitHub Documentation Page](http://vmware.github.io/docker-volume-vsphere/documentation/). +Detailed documentation can be found on our [GitHub Documentation Page](http://vmware.github.io/vsphere-storage-for-docker/documentation/). ## Prerequisites * Docker version: 17.06.0 or newer -* Base docker volume plugin: [vSphere Docker Volume Service](https://github.com/vmware/docker-volume-vsphere) +* Base docker volume plugin: [vSphere Docker Volume Service](https://github.com/vmware/vsphere-storage-for-docker) * All hosts running in [Swarm mode](https://docs.docker.com/engine/swarm/swarm-tutorial/) * All docker swarm managers should open [official etcd ports](http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.txt) 2379 and 2380, or the user-defined ETCD ports (please find more details about user-defined ETCD ports in the Installation section) @@ -43,7 +43,7 @@ Please see the following example: ~$ docker plugin install --grant-all-permissions --alias vfile vmware/vfile:latest VFILE_TIMEOUT_IN_SECOND=90 VFILE_ETCD_CLIENT_PORT=4001 VFILE_ETCD_PEER_PORT=4002 ``` -* The `VFILE_TIMEOUT_IN_SECOND` setting is strongly recommended before [Issue #1954](https://github.com/vmware/docker-volume-vsphere/issues/1954) is resolved. +* The `VFILE_TIMEOUT_IN_SECOND` setting is strongly recommended before [Issue #1954](https://github.com/vmware/vsphere-storage-for-docker/issues/1954) is resolved. ## Remove and Reinstallation The recommended order to remove and reinstallation is: @@ -175,7 +175,7 @@ vFile plugin can only work properly when the Docker Swarm cluster is healthy. If ## Q&A ### How to install and use the driver? -Please follow the instructions at [installation-on-esxi](http://vmware.github.io/docker-volume-vsphere/documentation/install.html#installation-on-esxi). +Please follow the instructions at [installation-on-esxi](http://vmware.github.io/vsphere-storage-for-docker/documentation/install.html#installation-on-esxi). ### Can I use another base volume plugin other than vDVS? Currently vFile volume service is only developed and tested with vDVS as the base volume plugin. diff --git a/docs/internal/ConfigDB_state.md b/docs/internal/ConfigDB_state.md index ade3192c8..73382755c 100644 --- a/docs/internal/ConfigDB_state.md +++ b/docs/internal/ConfigDB_state.md @@ -73,7 +73,7 @@ To transition from MultiNode, either the admin has to issue `config --rm` or the Discovery goal is to sync `vmdk_ops.py` Config DB state to reflect changes to the state done on a different ESXi node. -**The key use case** is initial configuration, where all nodes start with NotConfigured. On one of the nodes, admin (manually or via automation) configures a shared Config DB on a datastore visible to all nodes. Then discovery kicks in on all nodes, finds out there is a fresh Config DB on a shared store, and configures the node to use this DB. This way Admin only need to do configuration on one node and the rest pick it up . See Issue https://github.com/vmware/docker-volume-vsphere/issues/1086 for details. +**The key use case** is initial configuration, where all nodes start with NotConfigured. On one of the nodes, admin (manually or via automation) configures a shared Config DB on a datastore visible to all nodes. Then discovery kicks in on all nodes, finds out there is a fresh Config DB on a shared store, and configures the node to use this DB. This way Admin only need to do configuration on one node and the rest pick it up . See Issue https://github.com/vmware/vsphere-storage-for-docker/issues/1086 for details. The only state transition supported by Discovery is NotConfigured -> MultiNode. * Note - once defined, the DB becomes a single point of failure, and the only way to remove it is to run local CLI `config rm --local` on each ESX. diff --git a/docs/internal/UpgradeFrom_Pre0.11.1.md b/docs/internal/UpgradeFrom_Pre0.11.1.md index 5d172d1c3..e4d5c2650 100644 --- a/docs/internal/UpgradeFrom_Pre0.11.1.md +++ b/docs/internal/UpgradeFrom_Pre0.11.1.md @@ -38,17 +38,17 @@ vSphere Docker Volume Service RPMs on Docker VMs. ## Upgrade to newer build when you DO have Docker volumes to retain We provide a script to migrate data and configuration from Release 0.11 (or 0.10) to 0.11.2. -The script is located [here](https://raw.githubusercontent.com/vmware/docker-volume-vsphere/master/esx_service/cli/vmdkops_post_update.11.1.py). +The script is located [here](https://raw.githubusercontent.com/vmware/vsphere-storage-for-docker/master/esx_service/cli/vmdkops_post_update.11.1.py). -Upgrade steps are as follows: +Upgrade steps are as follows: * Install VIB with Release 0.11.2 (or later) on each ESX. * Download the upgrade script. This step is for Release 0.11.2 only. For 0.12 and later, skip directly to running the script. - * Download the script from https://raw.githubusercontent.com/vmware/docker-volume-vsphere/master/esx_service/cli/vmdkops_post_update.11.1.py and place it into /usr/lib/vmware/vmdkops/bin/ on each ESX + * Download the script from https://raw.githubusercontent.com/vmware/vsphere-storage-for-docker/master/esx_service/cli/vmdkops_post_update.11.1.py and place it into /usr/lib/vmware/vmdkops/bin/ on each ESX * make it executabe on each ESX : `cd /usr/lib/vmware/vmdkops/bin/ ; chmod a+x vmdkops_post_update.11.1.py;` * on each ESX, run `/usr/lib/vmware/vmdkops/bin/vmdkops_post_update.11.1.py` -To understand which steps the script is taking, please look at the [source](https://github.com/vmware/docker-volume-vsphere/blob/master/esx_service/cli/vmdkops_post_update.11.1.py) +To understand which steps the script is taking, please look at the [source](https://github.com/vmware/vsphere-storage-for-docker/blob/master/esx_service/cli/vmdkops_post_update.11.1.py) # Contact -As usual, if you have questions please [contact us](https://github.com/vmware/docker-volume-vsphere#contact-us) +As usual, if you have questions please [contact us](https://github.com/vmware/vsphere-storage-for-docker#contact-us) diff --git a/docs/internal/docker-plugin-drivers.md b/docs/internal/docker-plugin-drivers.md index 646114e91..5c9a4f3a8 100644 --- a/docs/internal/docker-plugin-drivers.md +++ b/docs/internal/docker-plugin-drivers.md @@ -9,7 +9,7 @@ The Docker volume plugin supports the vSphere platform and provides correspondin The Docker vsphere volume driver supports provisioning and managing docker volumes on a standalone or cluster of ESX servers via a service (ESX service) that's installed and runs on each server. Docker volumes are created and managed via publicly available VIM (Virtual Infrastructure Management) APIs on the ESX host. ## Configuring the Docker Volume Plugin -The docker volume plugin loads runtime options and values from a JSON configuration file (default `/etc/docker-volume-vsphere.conf` for Linux, `C:\ProgramData\docker-volume-vsphere\docker-volume-vsphere.conf` for Windows) on the host. The user can override the default configuration by providing a different configuration file, via the `--config` option, specifying the full path of the file. Options that are currently recognized include the below set. Options passed on the command line override those in the configuration file. +The docker volume plugin loads runtime options and values from a JSON configuration file (default `/etc/vsphere-storage-for-docker.conf` for Linux, `C:\ProgramData\vsphere-storage-for-docker\vsphere-storage-for-docker.conf` for Windows) on the host. The user can override the default configuration by providing a different configuration file, via the `--config` option, specifying the full path of the file. Options that are currently recognized include the below set. Options passed on the command line override those in the configuration file. ### Selecting the driver to handle volume operations The docker volume plugin supports a driver, namely, `vsphere` for the vSphere platform. The usage of driver is specified as below in the [sample configuration](#sample-plugin-configuration). @@ -28,7 +28,7 @@ The docker volume plugin supports a driver, namely, `vsphere` for the vSphere pl "MaxLogAgeDays": 28, "MaxLogFiles": 10, "MaxLogSizeMb": 10, - "LogPath": "/var/log/docker-volume-vsphere.log", + "LogPath": "/var/log/vsphere-storage-for-docker.log", "LogLevel": "info" } ``` diff --git a/docs/internal/vcenter.md b/docs/internal/vcenter.md index fe2f6114f..230582c05 100644 --- a/docs/internal/vcenter.md +++ b/docs/internal/vcenter.md @@ -1,4 +1,4 @@ # vCenter Integration vCenter Plugin integration is under development. -Please file any requirements as [GitHub Issues](https://github.com/vmware/docker-volume-vsphere/issues) or email [cna-storage@vmware.com](cna-storage ) \ No newline at end of file +Please file any requirements as [GitHub Issues](https://github.com/vmware/vsphere-storage-for-docker/issues) or email [cna-storage@vmware.com](cna-storage ) \ No newline at end of file diff --git a/docs/misc/vDVS_bulletin.xml b/docs/misc/vDVS_bulletin.xml index dd307b12e..9e489bfab 100644 --- a/docs/misc/vDVS_bulletin.xml +++ b/docs/misc/vDVS_bulletin.xml @@ -8,7 +8,7 @@ extension This bulletin contains details regarding the vSphere docker volume service driver VIB. - https://github.com/vmware/docker-volume-vsphere/wiki + https://github.com/vmware/vsphere-storage-for-docker/wiki VMware 2017-12-01T23:47:36.688572+00:00 diff --git a/esx_service/utils/auth_data.py b/esx_service/utils/auth_data.py index 046168ef1..36d5d8541 100644 --- a/esx_service/utils/auth_data.py +++ b/esx_service/utils/auth_data.py @@ -46,7 +46,7 @@ VMODL_MAJOR_VER = 1 VMODL_MINOR_VER = 0 -UPGRADE_README = "https://github.com/vmware/docker-volume-vsphere/blob/master/docs/misc/UpgradeFrom_Pre0.11.1.md" +UPGRADE_README = "https://github.com/vmware/vsphere-storage-for-docker/blob/master/docs/misc/UpgradeFrom_Pre0.11.1.md" class DBMode(object): diff --git a/esx_service/utils/kvESX.py b/esx_service/utils/kvESX.py index b612c59aa..0eb02da8c 100644 --- a/esx_service/utils/kvESX.py +++ b/esx_service/utils/kvESX.py @@ -47,7 +47,7 @@ DISK_LIB = "/lib/libvmsnapshot.so" lib = None use_sidecar_create = False -DVOL_KEY = "docker-volume-vsphere" +DVOL_KEY = "vsphere-storage-for-docker" # Volume attributes VOL_SIZE = 'size' diff --git a/esx_service/vmdk-opsd b/esx_service/vmdk-opsd index 6eedc7959..1e69547ed 100755 --- a/esx_service/vmdk-opsd +++ b/esx_service/vmdk-opsd @@ -109,7 +109,7 @@ start() { check_running_status # brute force hack - restart vsanmgmtd to force it to read and server out VMODL py files # turned off until we support kill switch. - # see https://github.com/vmware/docker-volume-vsphere/pull/975 for details. + # see https://github.com/vmware/vsphere-storage-for-docker/pull/975 for details. # /etc/init.d/vsanmgmtd restart ; sleep 3 ; exit $? diff --git a/esx_service/vmodl/Makefile b/esx_service/vmodl/Makefile index 8d2f0f235..fc94bd31d 100644 --- a/esx_service/vmodl/Makefile +++ b/esx_service/vmodl/Makefile @@ -81,7 +81,7 @@ else deploy test copy_to_payload: @echo "Ignoring VMODL '$@' target." - @echo See https://github.com/vmware/docker-volume-vsphere/pull/975 for details. + @echo See https://github.com/vmware/vsphere-storage-for-docker/pull/975 for details. endif diff --git a/esx_service/vmodl/vmodl_test.py b/esx_service/vmodl/vmodl_test.py index b1976cbcf..65ea00b34 100644 --- a/esx_service/vmodl/vmodl_test.py +++ b/esx_service/vmodl/vmodl_test.py @@ -34,7 +34,7 @@ import os, sys # nothing to test until we put VMODL back in the VIB -# See https://github.com/vmware/docker-volume-vsphere/pull/975 for details. +# See https://github.com/vmware/vsphere-storage-for-docker/pull/975 for details. if "INSTALL_VMODL" not in os.environ: print("Skipping VMODL test - INSTALL_VMODL is not defined") sys.exit(0) diff --git a/install-vdvs.ps1 b/install-vdvs.ps1 index fcec3eb59..2b54bacee 100644 --- a/install-vdvs.ps1 +++ b/install-vdvs.ps1 @@ -30,11 +30,11 @@ .DESCRIPTION This script helps to download, install, uninstall, and re-install VMware vSphere Docker Volume Plugin on your system. .EXAMPLE - ./install-vdvs.ps1 https://bintray.com/vmware/vDVS/download_file?file_path=docker-volume-vsphere.zip + ./install-vdvs.ps1 https://bintray.com/vmware/vDVS/download_file?file_path=vsphere-storage-for-docker.zip .EXAMPLE ./install-vdvs.ps1 -uninstall .LINK - https://vmware.github.io/docker-volume-vsphere/ + https://vmware.github.io/vsphere-storage-for-docker/ #> # Command line parameters @@ -50,7 +50,7 @@ $svcDisplayName = "vSphere Docker Volume Service" $svcDescription = "Enables user to run stateful containerized applications on top of VMware vSphere." $installPath = "C:\Program Files\VMware\vmdkops" $exePathName = $installPath + "\vdvs.exe" -$zipFileName = "docker-volume-vsphere.zip" +$zipFileName = "vsphere-storage-for-docker.zip" function Uninstall-Service([System.ServiceProcess.ServiceController]$svc) { if ($svc.Status -eq "Running") { diff --git a/misc/README.md b/misc/README.md index 9e294e73d..a04c582fc 100644 --- a/misc/README.md +++ b/misc/README.md @@ -1,7 +1,7 @@ This directory contains scripts and other files (e.g. Dockerfiles) needed for -the following: +the following: -* building RPM / DEB and VIB packages for docker-volume-vsphere plugin +* building RPM / DEB and VIB packages for vsphere-storage-for-docker plugin * running CI (we use https://drone.io/) The subdirs are as follows: diff --git a/misc/demos/README.md b/misc/demos/README.md index b55d22bbd..2e6023db0 100644 --- a/misc/demos/README.md +++ b/misc/demos/README.md @@ -1,5 +1,5 @@ # Demos location -Demos are posted to the project [wiki](https://github.com/vmware/docker-volume-vsphere/wiki) +Demos are posted to the project [wiki](https://github.com/vmware/vsphere-storage-for-docker/wiki) # Demos how to CLI based demos are done using * https://github.com/redhat-cip/spielbash diff --git a/misc/demos/install-esx.yaml b/misc/demos/install-esx.yaml index f38843870..0d1e9e3c0 100644 --- a/misc/demos/install-esx.yaml +++ b/misc/demos/install-esx.yaml @@ -1,12 +1,12 @@ title: Install VIB on ESX -scenes: +scenes: - name: Download ESX action: echo "Download the latest VIB from GitHub Releases." - name: Curl rpm - action: curl -OL https://github.com/vmware/docker-volume-vsphere/releases/download/1.0.beta/vmware-esx-vmdkops-1.0.beta.vib + action: curl -OL https://github.com/vmware/vsphere-storage-for-docker/releases/download/1.0.beta/vmware-esx-vmdkops-1.0.beta.vib wait: true - name: Copy VIB - action: scp docker-volume-vsphere-1.0.beta-1.x86_64.rpm root@$ESX:/tmp + action: scp vsphere-storage-for-docker-1.0.beta-1.x86_64.rpm root@$ESX:/tmp wait: true - name: Install VIB action: ssh root@$ESX esxcli software vib install --no-sig-check -v /tmp/vmware-esx-vmdkops-1.0.beta.vib @@ -14,6 +14,6 @@ scenes: - name: Check Status action: ssh root@$ESX /etc/init.d/vmdk-opsd status - name: All done - action: echo All done. Simple install, zero config.. + action: echo All done. Simple install, zero config.. - name: just a pause pause: 3 diff --git a/misc/demos/install-vm.yaml b/misc/demos/install-vm.yaml index 01e126bb8..401f8f5c9 100644 --- a/misc/demos/install-vm.yaml +++ b/misc/demos/install-vm.yaml @@ -1,21 +1,21 @@ title: Install plugin in VM -scenes: +scenes: - name: Download RPM/Deb action: echo "Download RPM or Deb from GitHub Releases. Using RPM on Photon here.." - name: Curl rpm - action: curl -OL https://github.com/vmware/docker-volume-vsphere/releases/download/1.0.beta/docker-volume-vsphere-1.0.beta-1.x86_64.rpm + action: curl -OL https://github.com/vmware/vsphere-storage-for-docker/releases/download/1.0.beta/vsphere-storage-for-docker-1.0.beta-1.x86_64.rpm wait: true - name: just a pause pause: 1 - name: Copy RPM - action: scp docker-volume-vsphere-1.0.beta-1.x86_64.rpm root@$VM:/tmp + action: scp vsphere-storage-for-docker-1.0.beta-1.x86_64.rpm root@$VM:/tmp wait: true - name: Install RPM - action: ssh root@$VM rpm -i /tmp/docker-volume-vsphere-1.0.beta-1.x86_64.rpm + action: ssh root@$VM rpm -i /tmp/vsphere-storage-for-docker-1.0.beta-1.x86_64.rpm wait: true - name: Check Status - action: ssh root@$VM systemctl status docker-volume-vsphere + action: ssh root@$VM systemctl status vsphere-storage-for-docker - name: All done - action: echo All done. Simple install, zero config.. + action: echo All done. Simple install, zero config.. - name: just a pause pause: 3 diff --git a/misc/dockerfiles/Dockerfile.vibauthor-and-go b/misc/dockerfiles/Dockerfile.vibauthor-and-go index 67ed6db89..a20b6ee13 100644 --- a/misc/dockerfiles/Dockerfile.vibauthor-and-go +++ b/misc/dockerfiles/Dockerfile.vibauthor-and-go @@ -5,12 +5,12 @@ # This is published to docker hub for 2 reasons # 1. Drone cannot build this image and then use it without forking # a separate repo and adding dependencies between dockerfile -# and the docker-volume-vsphere repo. +# and the vsphere-storage-for-docker repo. # 2. Others outside the project can find this useful. # -## This container is used for different duties in docker-volume-vsphere dev process: +## This container is used for different duties in vsphere-storage-for-docker dev process: ## ## - Build of GO code => need golang 1.5+ ## - Build of C VMCI wrappers => need gcc and 32 bit libs diff --git a/misc/dockerfiles/Dockerfile.vmdk-plugin b/misc/dockerfiles/Dockerfile.vmdk-plugin index c4a230f1b..baae6ea30 100644 --- a/misc/dockerfiles/Dockerfile.vmdk-plugin +++ b/misc/dockerfiles/Dockerfile.vmdk-plugin @@ -2,6 +2,6 @@ FROM alpine MAINTAINER cna-storage@vmware.com -ADD ./build/docker-volume-vsphere /usr/local/bin/docker-volume-vsphere +ADD ./build/vsphere-storage-for-docker /usr/local/bin/vsphere-storage-for-docker -ENTRYPOINT ["/usr/local/bin/docker-volume-vsphere"] +ENTRYPOINT ["/usr/local/bin/vsphere-storage-for-docker"] diff --git a/misc/drone-scripts/dump_log.sh b/misc/drone-scripts/dump_log.sh index 914ab50aa..99466399d 100755 --- a/misc/drone-scripts/dump_log.sh +++ b/misc/drone-scripts/dump_log.sh @@ -15,7 +15,7 @@ # A few helper functions for dumping logs -VM_LOGFILE="/var/log/docker-volume-vsphere.log" +VM_LOGFILE="/var/log/vsphere-storage-for-docker.log" ESX_LOGFILE="/var/log/vmware/vmdk_ops.log" HOSTD_LOGFILE="/var/log/hostd.log" SYS_LOGFILE="/var/log/syslog" diff --git a/misc/drone-scripts/lock.sh b/misc/drone-scripts/lock.sh index 3176a3d99..2bbd60a0a 100755 --- a/misc/drone-scripts/lock.sh +++ b/misc/drone-scripts/lock.sh @@ -17,7 +17,7 @@ OPERATION=$1 BUILD_NUMBER=build-$2 -LOCK_DIR='/tmp/docker-volume-vsphere.lock' +LOCK_DIR='/tmp/vsphere-storage-for-docker.lock' if [ "$OPERATION" == "lock" ]; then if mkdir "$LOCK_DIR"; @@ -33,12 +33,12 @@ fi LOCK_BUILD_NUMBER=`cat $LOCK_DIR/build` if [ "$OPERATION" == "unlock" ]; then - + if [ "$LOCK_BUILD_NUMBER" != "$BUILD_NUMBER" ]; then echo "lock held by $LOCK_BUILD_NUMBER != $BUILD_NUMBER" exit 1 fi - + rm $LOCK_DIR/build rmdir $LOCK_DIR echo "Lock for $BUILD_NUMBER released" diff --git a/misc/drone-scripts/validate-and-serialize.sh b/misc/drone-scripts/validate-and-serialize.sh index 10bb4e322..f6f7234c7 100755 --- a/misc/drone-scripts/validate-and-serialize.sh +++ b/misc/drone-scripts/validate-and-serialize.sh @@ -38,7 +38,7 @@ interval=90 # current build have the same ID function is_cleanup_needed { # Retrieve on-going build information - ongoingBuildInfo=`drone build info vmware/docker-volume-vsphere $1` + ongoingBuildInfo=`drone build info vmware/vsphere-storage-for-docker $1` buildInfoObj=($ongoingBuildInfo) # verifies status value OR request is resulted from *Restart* event @@ -58,7 +58,7 @@ function release_lock { echo "USAGE: release_lock " return 2; fi - govc datastore.rm $DS docker-volume-vsphere/$1 + govc datastore.rm $DS vsphere-storage-for-docker/$1 return $? } @@ -70,7 +70,7 @@ function acquire_lock { echo "USAGE: acquire_lock " return 2; fi - govc datastore.mkdir $DS docker-volume-vsphere/$1 2>/dev/null > /dev/null + govc datastore.mkdir $DS vsphere-storage-for-docker/$1 2>/dev/null > /dev/null return $? } @@ -85,14 +85,14 @@ do if acquire_lock $check_lock then # Grab ongoing build information from drone. - runningBuild=`govc datastore.ls $DS docker-volume-vsphere/ongoing` + runningBuild=`govc datastore.ls $DS vsphere-storage-for-docker/ongoing` runningBuildArr=($runningBuild) # Let's check cleanup is needed or not # cleans up if return value is 0 otherwise not; checking build is finished or not if is_cleanup_needed ${runningBuildArr[0]} then echo "Cleaning stale data..." - govc datastore.rm $DS docker-volume-vsphere/ongoing/${runningBuildArr[0]} + govc datastore.rm $DS vsphere-storage-for-docker/ongoing/${runningBuildArr[0]} release_lock $check_lock break else @@ -105,6 +105,6 @@ do sleep $interval; done -govc datastore.mkdir $DS docker-volume-vsphere/ongoing/$DRONE_BUILD_NUMBER +govc datastore.mkdir $DS vsphere-storage-for-docker/ongoing/$DRONE_BUILD_NUMBER echo "$DRONE_BUILD_NUMBER is added to ongoing folder" exit 0 \ No newline at end of file diff --git a/misc/scripts/build.sh b/misc/scripts/build.sh index 3032b6b4f..6b161e1c2 100755 --- a/misc/scripts/build.sh +++ b/misc/scripts/build.sh @@ -88,7 +88,7 @@ pylint_container=cnastorage/pylint docs_container=cnastorage/gh-documentation # mount point within the container. -dir=/go/src/github.com/vmware/docker-volume-vsphere +dir=/go/src/github.com/vmware/vsphere-storage-for-docker # We need to mount this into the container: host_dir=$PWD/.. diff --git a/misc/scripts/check.sh b/misc/scripts/check.sh index 49817babb..3a1ab9de9 100755 --- a/misc/scripts/check.sh +++ b/misc/scripts/check.sh @@ -84,7 +84,7 @@ then printNQuit "GOPATH environment variable needs to be set" fi -EXPECTED_PATH="$GOPATH/src/github.com/vmware/docker-volume-vsphere/client_plugin" +EXPECTED_PATH="$GOPATH/src/github.com/vmware/vsphere-storage-for-docker/client_plugin" if [[ "$EXPECTED_PATH" != "$PWD" ]] then diff --git a/misc/scripts/deploy-tools.sh b/misc/scripts/deploy-tools.sh index 99a4b1fc4..ffd9fcf93 100755 --- a/misc/scripts/deploy-tools.sh +++ b/misc/scripts/deploy-tools.sh @@ -29,7 +29,7 @@ . ../misc/scripts/commands.sh -PLUGIN_NAME=docker-volume-vsphere +PLUGIN_NAME=vsphere-storage-for-docker VFILE_PLUGNAME=vfile VIB_NAME=esx-vmdkops-service TMP_LOC=/tmp/$PLUGIN_NAME @@ -42,8 +42,8 @@ PLUGIN_SRC_DIR=../ PLUGIN_SRC_ZIP=vdvs-src.zip PLUGIN_BIN_ZIP=vdvs-bin.zip WIN_TEMP_DIR=C:\\Users\\root\\AppData\\Local\\Temp -WIN_PLUGIN_SRC_DIR=C:\\Users\\root\\go\\src\\github.com\\vmware\\docker-volume-vsphere -WIN_PLUGIN_BIN_ZIP_LOC=$WIN_PLUGIN_SRC_DIR\\build\\windows\\docker-volume-vsphere.zip +WIN_PLUGIN_SRC_DIR=C:\\Users\\root\\go\\src\\github.com\\vmware\\vsphere-storage-for-docker +WIN_PLUGIN_BIN_ZIP_LOC=$WIN_PLUGIN_SRC_DIR\\build\\windows\\vsphere-storage-for-docker.zip WIN_BUILD_DIR=build/windows/ HOSTD=/etc/init.d/hostd diff --git a/misc/scripts/install/after-install.sh b/misc/scripts/install/after-install.sh index 301edc812..512ed35c8 100755 --- a/misc/scripts/install/after-install.sh +++ b/misc/scripts/install/after-install.sh @@ -17,8 +17,8 @@ stat /proc/1/exe | grep File | grep systemd if [ $? -eq 0 ] then systemctl daemon-reload - systemctl enable docker-volume-vsphere.service - systemctl start docker-volume-vsphere.service + systemctl enable vsphere-storage-for-docker.service + systemctl start vsphere-storage-for-docker.service else - service docker-volume-vsphere start + service vsphere-storage-for-docker start fi diff --git a/misc/scripts/install/before-remove.sh b/misc/scripts/install/before-remove.sh index 1fbe4230f..903bf17a3 100755 --- a/misc/scripts/install/before-remove.sh +++ b/misc/scripts/install/before-remove.sh @@ -17,9 +17,9 @@ stat /proc/1/exe | grep File | grep systemd if [ $? -eq 0 ] then - systemctl stop docker-volume-vsphere.service - systemctl disable docker-volume-vsphere.service + systemctl stop vsphere-storage-for-docker.service + systemctl disable vsphere-storage-for-docker.service else - service docker-volume-vsphere stop + service vsphere-storage-for-docker stop fi exit 0 diff --git a/misc/scripts/install/docker-volume-vsphere.service b/misc/scripts/install/docker-volume-vsphere.service deleted file mode 100644 index 207ba27c3..000000000 --- a/misc/scripts/install/docker-volume-vsphere.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description="Docker Volume Driver for vSphere" -Before=docker.service -Requires=docker.service - -[Service] -ExecStart=/usr/local/bin/docker-volume-vsphere -port 1019 -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/misc/scripts/install/docker-volume-vsphere.conf b/misc/scripts/install/vsphere-storage-for-docker.conf similarity index 70% rename from misc/scripts/install/docker-volume-vsphere.conf rename to misc/scripts/install/vsphere-storage-for-docker.conf index 34e437f71..fbf08ae91 100644 --- a/misc/scripts/install/docker-volume-vsphere.conf +++ b/misc/scripts/install/vsphere-storage-for-docker.conf @@ -1,4 +1,4 @@ -description "Docker Volume Driver for vSphere" +description "Docker Volume Driver for vSphere Storage" start on starting docker stop on stopped docker RESULT=ok diff --git a/misc/scripts/install/vsphere-storage-for-docker.service b/misc/scripts/install/vsphere-storage-for-docker.service new file mode 100644 index 000000000..a1eb6e170 --- /dev/null +++ b/misc/scripts/install/vsphere-storage-for-docker.service @@ -0,0 +1,11 @@ +[Unit] +Description="Docker Volume Driver for vSphere Storage" +Before=docker.service +Requires=docker.service + +[Service] +ExecStart=/usr/local/bin/vsphere-storage-for-docker -port 1019 +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/misc/scripts/plugin_sanity_test.sh b/misc/scripts/plugin_sanity_test.sh index 92f0bdc77..b814f00e5 100644 --- a/misc/scripts/plugin_sanity_test.sh +++ b/misc/scripts/plugin_sanity_test.sh @@ -15,7 +15,7 @@ # limitations under the License. # To sanity test on the same VM using managed plugin -# More information https://github.com/vmware/docker-volume-vsphere/issues/1020#issue-213470358 +# More information https://github.com/vmware/vsphere-storage-for-docker/issues/1020#issue-213470358 echo "plugin_sanity_test: [INFO] Running plugin_sanity_test on the clean test setup..." diff --git a/misc/scripts/update_gh_pages.sh b/misc/scripts/update_gh_pages.sh index e72d6c342..9cb1c004c 100755 --- a/misc/scripts/update_gh_pages.sh +++ b/misc/scripts/update_gh_pages.sh @@ -8,20 +8,20 @@ set -e # A. Pre-requisite: # # 1. Local copy of vDVS project is needed before running this script -# $ git clone https://github.com/vmware/docker-volume-vsphere.git) +# $ git clone https://github.com/vmware/vsphere-storage-for-docker.git) # # 2. Before executing this script, its important to have two git remotes: origin and vmware # $ git remote -v -# origin https://github.com/ashahi1/docker-volume-vsphere.git (fetch) -# origin https://github.com/ashahi1/docker-volume-vsphere.git (push) -# vmware https://github.com/vmware/docker-volume-vsphere.git (fetch) -# vmware https://github.com/vmware/docker-volume-vsphere.git (push) +# origin https://github.com/ashahi1/vsphere-storage-for-docker.git (fetch) +# origin https://github.com/ashahi1/vsphere-storage-for-docker.git (push) +# vmware https://github.com/vmware/vsphere-storage-for-docker.git (fetch) +# vmware https://github.com/vmware/vsphere-storage-for-docker.git (push) # # 3. Now we need to fetch all the remote branches # $ git fetch --all # # -# B. Run the script from docker-volume-vsphere/ +# B. Run the script from vsphere-storage-for-docker/ # $ ./misc/scripts/update_gh_pages.sh # diff --git a/misc/scripts/upgrade_test.sh b/misc/scripts/upgrade_test.sh index 7b07b6b1a..f8f7d749b 100755 --- a/misc/scripts/upgrade_test.sh +++ b/misc/scripts/upgrade_test.sh @@ -15,7 +15,7 @@ source ../misc/scripts/commands.sh MANAGED_PLUGIN_NAME="vsphere:latest" - E2E_Tests="github.com/vmware/docker-volume-vsphere/tests/e2e" + E2E_Tests="github.com/vmware/vsphere-storage-for-docker/tests/e2e" GO="go" DEPLOY_TOOLS_SH=../misc/scripts/deploy-tools.sh @@ -80,8 +80,8 @@ echo "Upgrade test step 2.1: remove plugin $MANAGED_PLUGIN_NAME on $VM1" $DEPLOY_TOOLS_SH cleanvm $VM1 $MANAGED_PLUGIN_NAME - echo "Upgrade test step 2.2: deploy plugin vmware/docker-volume-vsphere:$UPGRADE_FROM_VER on $VM1" - ../misc/scripts/deploy-tools.sh deployvm $VM1 vmware/docker-volume-vsphere:$UPGRADE_FROM_VER + echo "Upgrade test step 2.2: deploy plugin vmware/vsphere-storage-for-docker:$UPGRADE_FROM_VER on $VM1" + ../misc/scripts/deploy-tools.sh deployvm $VM1 vmware/vsphere-storage-for-docker:$UPGRADE_FROM_VER $SSH $VM1 "systemctl restart docker || service docker restart" echo "Upgrade test step 3: run pre-upgrade test" @@ -101,8 +101,8 @@ if [ $UPGRADE_TO_VER != "CURRENT" ] then - echo "Upgrade test step 5.2: deploy plugin vmware/docker-volume-vsphere:$UPGRADE_TO_VER on $VM1" - $DEPLOY_TOOLS_SH deployvm $VM1 vmware/docker-volume-vsphere:$UPGRADE_TO_VER + echo "Upgrade test step 5.2: deploy plugin vmware/vsphere-storage-for-docker:$UPGRADE_TO_VER on $VM1" + $DEPLOY_TOOLS_SH deployvm $VM1 vmware/vsphere-storage-for-docker:$UPGRADE_TO_VER else echo "Upgrade test step 5.2: deploy plugin $PLUGIN_NAME:$PLUGIN_TAG on $VM1" $DEPLOY_TOOLS_SH deployvm $VM1 $PLUGIN_NAME:$PLUGIN_TAG diff --git a/mkdocs.yml b/mkdocs.yml index d73177253..5392cabdf 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,7 +1,7 @@ site_name: vSphere Docker Volume Service pages: - Home: index.md - - Setup: + - Setup: - Installation: user-guide/install.md - Advanced Configuration: user-guide/docker-plugin-drivers.md - User Guide: @@ -18,11 +18,11 @@ pages: - Release announcement and updates: blog/2016-9-28.md - 0.8.1 Release (Tenancy) and stateful containers meetup: blog/2016-10-28.md theme: readthedocs -google_analytics: ['UA-81413942-1', 'https://vmware.github.io/docker-volume-vsphere/'] +google_analytics: ['UA-81413942-1', 'https://vmware.github.io/vsphere-storage-for-docker/'] site_favicon: favicon.ico site_author: containers@vmware.com site_name: vSphere Docker Volume Service -site_url: https://vmware.github.io/docker-volume-vsphere/ +site_url: https://vmware.github.io/vsphere-storage-for-docker/ dev_addr: 0.0.0.0:8000 markdown_extensions: - smarty diff --git a/plugin_dockerbuild/.gitignore b/plugin_dockerbuild/.gitignore index 9cf081a18..b73962f45 100644 --- a/plugin_dockerbuild/.gitignore +++ b/plugin_dockerbuild/.gitignore @@ -1,4 +1,4 @@ -docker-volume-vsphere +vsphere-storage-for-docker vfile Dockerfile config.json diff --git a/plugin_dockerbuild/Dockerfile.vfile b/plugin_dockerbuild/Dockerfile.vfile index db7f1274e..1f1645860 100644 --- a/plugin_dockerbuild/Dockerfile.vfile +++ b/plugin_dockerbuild/Dockerfile.vfile @@ -1,4 +1,4 @@ -# Dockerile for packaging https://github.com/vmware/docker-volume-vsphere as +# Dockerile for packaging https://github.com/vmware/vsphere-storage-for-docker as # Docker managed plugin. # # Image created with this file is used to unpack to plugin rootfs and then build diff --git a/plugin_dockerbuild/Dockerfile.vmdk b/plugin_dockerbuild/Dockerfile.vmdk index 26a617a1f..d5b3246f4 100644 --- a/plugin_dockerbuild/Dockerfile.vmdk +++ b/plugin_dockerbuild/Dockerfile.vmdk @@ -1,4 +1,4 @@ -# Dockerile for packaging https://github.com/vmware/docker-volume-vsphere as +# Dockerile for packaging https://github.com/vmware/vsphere-storage-for-docker as # Docker managed plugin. # # Image created with this file is used to unpack to plugin rootfs and then build @@ -11,5 +11,5 @@ FROM alpine:3.5 RUN apk update ; apk add e2fsprogs xfsprogs RUN mkdir -p /mnt/vmdk -COPY docker-volume-vsphere /usr/bin -CMD ["/usr/bin/docker-volume-vsphere"] +COPY vsphere-storage-for-docker /usr/bin +CMD ["/usr/bin/vsphere-storage-for-docker"] diff --git a/plugin_dockerbuild/Makefile b/plugin_dockerbuild/Makefile index 9e6dba363..ff1822a54 100644 --- a/plugin_dockerbuild/Makefile +++ b/plugin_dockerbuild/Makefile @@ -20,7 +20,7 @@ # managed plugin # -# Makefile names the plugin simlarly to this (for example) 'msterin/docker-volume-vsphere:0.13-dev' +# Makefile names the plugin simlarly to this (for example) 'msterin/vsphere-storage-for-docker:0.13-dev' # # Make targets: # info (helpful info), clean (remove build artefacts), plugin, (build plugin), push (push to dockerhub) @@ -30,7 +30,7 @@ -include ../Commonvars.mk # Binaries we want to pick up from the actual build -BINARY ?= docker-volume-vsphere +BINARY ?= vsphere-storage-for-docker VFILE_BINARY := vfile # Dockerfile templates diff --git a/plugin_dockerbuild/Readme.md b/plugin_dockerbuild/Readme.md index ec5b6ccfe..32ae66fda 100644 --- a/plugin_dockerbuild/Readme.md +++ b/plugin_dockerbuild/Readme.md @@ -1,4 +1,4 @@ -### Support for building docker-volume-vsphere(DVS) as Docker Managed Plugin +### Support for building vsphere-storage-for-docker(DVS) as Docker Managed Plugin Docker managed plugins are currently documented [here](https://docs.docker.com/engine/extend/) @@ -8,28 +8,28 @@ as a Managed Plugin, and push to dockerhub. **Note that this is not integrated with Build or CI, which is an upcoming change** -Assuming the `Makefile` defines names as 'cnastorage/docker-volume-vsphere:0.12', the plugin could +Assuming the `Makefile` defines names as 'cnastorage/vsphere-storage-for-docker:0.12', the plugin could be installed on Docker (1.13+) as follows: * no question asked, and pretend the plugin name is 'vsphere' (can be used in `volume create` and `plugin rm`) ``` docker plugin install --grant-all-permissions --alias vsphere \ - cnastorage/docker-volume-vsphere:0.12 + cnastorage/vsphere-storage-for-docker:0.12 ``` * vanilla interactive install as disabled plugin (will require `docker plugin enable ` to be operational ``` -docker plugin install --disable cnastorage/docker-volume-vsphere:0.12 +docker plugin install --disable cnastorage/vsphere-storage-for-docker:0.12 ``` -The `docker volume` command behaves as before but the plugin name in `docker create` is either what was passed as `--alias` or the full plugin name , i.e. `cnastorage/docker-volume-vsphere:0.12` +The `docker volume` command behaves as before but the plugin name in `docker create` is either what was passed as `--alias` or the full plugin name , i.e. `cnastorage/vsphere-storage-for-docker:0.12` #### Logs -The plugin logs are still at `/var/log/docker-volume-vsphere.log` +The plugin logs are still at `/var/log/vsphere-storage-for-docker.log` However, you can change the log level by passing `VDVS_LOG_LEVEL` key to `docker plugin install`, e.g. ``` docker plugin install --grant-all-permissions \ - cnastorage/docker-volume-vsphere:0.12 VDVS_LOG_LEVEL=debug + cnastorage/vsphere-storage-for-docker:0.12 VDVS_LOG_LEVEL=debug ``` #### Socket group ID diff --git a/plugin_dockerbuild/config.json-template b/plugin_dockerbuild/config.json-template index 91c06f534..779b693a6 100644 --- a/plugin_dockerbuild/config.json-template +++ b/plugin_dockerbuild/config.json-template @@ -1,6 +1,6 @@ { "Description": "VMWare %NAME% Docker Volume plugin", - "Documentation": "http://vmware.github.io/docker-volume-vsphere/documentation", + "Documentation": "http://vmware.github.io/vsphere-storage-for-docker/documentation", "Entrypoint": ["/usr/bin/%BINARY%", "--config", "/etc/%BINARY%.conf" ], diff --git a/tests/constants/dockercli/cmd.go b/tests/constants/dockercli/cmd.go index 05536c94a..0d12a3d48 100644 --- a/tests/constants/dockercli/cmd.go +++ b/tests/constants/dockercli/cmd.go @@ -47,7 +47,7 @@ const ( VDVSPluginName = "vsphere " // VDVSName name of the vDVS service - VDVSName = "docker-volume-vsphere" + VDVSName = "vsphere-storage-for-docker" // GetVDVSPlugin gets vDVS plugin info GetVDVSPlugin = docker + "plugin list --no-trunc | grep " + VDVSPluginName diff --git a/tests/constants/vm/vm.go b/tests/constants/vm/vm.go index 5140a0ef9..ff0005857 100644 --- a/tests/constants/vm/vm.go +++ b/tests/constants/vm/vm.go @@ -21,5 +21,5 @@ const ( MountFile = " /proc/mounts" // LogFile location of the vDVS log file on docker host. - LogFile = " /var/log/docker-volume-vsphere.log" + LogFile = " /var/log/vsphere-storage-for-docker.log" ) diff --git a/tests/e2e/advanced_vfile_test.go b/tests/e2e/advanced_vfile_test.go index 2835f5edb..2fb70e0d8 100644 --- a/tests/e2e/advanced_vfile_test.go +++ b/tests/e2e/advanced_vfile_test.go @@ -22,10 +22,10 @@ package e2e import ( "strconv" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/basic_test.go b/tests/e2e/basic_test.go index cf0d689ee..87cb8b3c0 100644 --- a/tests/e2e/basic_test.go +++ b/tests/e2e/basic_test.go @@ -20,10 +20,10 @@ package e2e import ( - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/basic_vfile_test.go b/tests/e2e/basic_vfile_test.go index c9c9334d1..4575f005f 100644 --- a/tests/e2e/basic_vfile_test.go +++ b/tests/e2e/basic_vfile_test.go @@ -24,10 +24,10 @@ import ( "strconv" "time" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/basicdefault_test.go b/tests/e2e/basicdefault_test.go index 1f24e1796..c5f33324a 100644 --- a/tests/e2e/basicdefault_test.go +++ b/tests/e2e/basicdefault_test.go @@ -20,11 +20,11 @@ package e2e import ( - admincliconst "github.com/vmware/docker-volume-vsphere/tests/constants/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + admincliconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/defaultvmgroup_test.go b/tests/e2e/defaultvmgroup_test.go index 1e7bc2d03..4a77568dc 100644 --- a/tests/e2e/defaultvmgroup_test.go +++ b/tests/e2e/defaultvmgroup_test.go @@ -21,14 +21,14 @@ package e2e import ( "strings" - admincliconst "github.com/vmware/docker-volume-vsphere/tests/constants/admincli" - dockerconst "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + admincliconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/admincli" + dockerconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/parallelvolumecreate_test.go b/tests/e2e/parallelvolumecreate_test.go index 78f12eca5..395eecb9e 100644 --- a/tests/e2e/parallelvolumecreate_test.go +++ b/tests/e2e/parallelvolumecreate_test.go @@ -25,10 +25,10 @@ import ( "strings" "sync" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/post_upgrade_test.go b/tests/e2e/post_upgrade_test.go index b27bad2f6..d5402f6f5 100644 --- a/tests/e2e/post_upgrade_test.go +++ b/tests/e2e/post_upgrade_test.go @@ -20,12 +20,12 @@ package e2e import ( - dockerconst "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - upgradeconst "github.com/vmware/docker-volume-vsphere/tests/constants/upgrade" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + dockerconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + upgradeconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/upgrade" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/pre_upgrade_test.go b/tests/e2e/pre_upgrade_test.go index a7599fcfc..1dc4e9bbd 100644 --- a/tests/e2e/pre_upgrade_test.go +++ b/tests/e2e/pre_upgrade_test.go @@ -20,12 +20,12 @@ package e2e import ( - dockerconst "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - upgradeconst "github.com/vmware/docker-volume-vsphere/tests/constants/upgrade" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + dockerconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + upgradeconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/upgrade" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/refcount_test.go b/tests/e2e/refcount_test.go index 9e6bd929e..6027529de 100644 --- a/tests/e2e/refcount_test.go +++ b/tests/e2e/refcount_test.go @@ -24,11 +24,11 @@ import ( . "gopkg.in/check.v1" - "github.com/vmware/docker-volume-vsphere/tests/utils/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" ) type RefcountTestSuite struct { diff --git a/tests/e2e/restart_test.go b/tests/e2e/restart_test.go index ccb2381ec..c55ac3d67 100644 --- a/tests/e2e/restart_test.go +++ b/tests/e2e/restart_test.go @@ -25,12 +25,12 @@ import ( . "gopkg.in/check.v1" - adminconst "github.com/vmware/docker-volume-vsphere/tests/constants/admincli" - adminutil "github.com/vmware/docker-volume-vsphere/tests/utils/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + adminconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/admincli" + adminutil "github.com/vmware/vsphere-storage-for-docker/tests/utils/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" ) type RestartTestData struct { diff --git a/tests/e2e/swarm_test.go b/tests/e2e/swarm_test.go index 49a605369..b7b45c453 100644 --- a/tests/e2e/swarm_test.go +++ b/tests/e2e/swarm_test.go @@ -24,13 +24,13 @@ import ( . "gopkg.in/check.v1" - constant "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/constants/properties" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/esx" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + constant "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/properties" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/esx" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" ) type SwarmTestSuite struct { diff --git a/tests/e2e/vfile_demote_promote_test.go b/tests/e2e/vfile_demote_promote_test.go index 707256cdd..9d5a9b041 100644 --- a/tests/e2e/vfile_demote_promote_test.go +++ b/tests/e2e/vfile_demote_promote_test.go @@ -24,10 +24,10 @@ import ( "strconv" "time" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/vmgroupmisc_test.go b/tests/e2e/vmgroupmisc_test.go index 3a3d0e1a6..e5858ca96 100644 --- a/tests/e2e/vmgroupmisc_test.go +++ b/tests/e2e/vmgroupmisc_test.go @@ -19,13 +19,13 @@ package e2e import ( - admincliconst "github.com/vmware/docker-volume-vsphere/tests/constants/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/esx" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + admincliconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/esx" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/vmgroups_test.go b/tests/e2e/vmgroups_test.go index 717a63e2b..7fa6eec6b 100644 --- a/tests/e2e/vmgroups_test.go +++ b/tests/e2e/vmgroups_test.go @@ -22,13 +22,13 @@ import ( "log" "strings" - adminconst "github.com/vmware/docker-volume-vsphere/tests/constants/admincli" - adminutils "github.com/vmware/docker-volume-vsphere/tests/utils/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + adminconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/admincli" + adminutils "github.com/vmware/vsphere-storage-for-docker/tests/utils/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/vmlistener_test.go b/tests/e2e/vmlistener_test.go index f9cc2eb4e..378fde5de 100644 --- a/tests/e2e/vmlistener_test.go +++ b/tests/e2e/vmlistener_test.go @@ -25,15 +25,15 @@ import ( . "gopkg.in/check.v1" - adminconst "github.com/vmware/docker-volume-vsphere/tests/constants/admincli" - "github.com/vmware/docker-volume-vsphere/tests/constants/properties" - "github.com/vmware/docker-volume-vsphere/tests/utils/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - esxutil "github.com/vmware/docker-volume-vsphere/tests/utils/esx" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + adminconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/properties" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + esxutil "github.com/vmware/vsphere-storage-for-docker/tests/utils/esx" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" ) const ( diff --git a/tests/e2e/vmops_test.go b/tests/e2e/vmops_test.go index 5385da9c8..62010140a 100644 --- a/tests/e2e/vmops_test.go +++ b/tests/e2e/vmops_test.go @@ -22,12 +22,12 @@ package e2e import ( "log" - adminutils "github.com/vmware/docker-volume-vsphere/tests/utils/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/esx" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + adminutils "github.com/vmware/vsphere-storage-for-docker/tests/utils/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/esx" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/volume_access_test.go b/tests/e2e/volume_access_test.go index 94ebfd055..cbb7d5e86 100644 --- a/tests/e2e/volume_access_test.go +++ b/tests/e2e/volume_access_test.go @@ -24,11 +24,11 @@ import ( . "gopkg.in/check.v1" - adminconst "github.com/vmware/docker-volume-vsphere/tests/constants/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" + adminconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" ) const ( diff --git a/tests/e2e/volumecreate_test.go b/tests/e2e/volumecreate_test.go index fea0d385d..ead8a1aca 100644 --- a/tests/e2e/volumecreate_test.go +++ b/tests/e2e/volumecreate_test.go @@ -22,11 +22,11 @@ import ( "strings" "sync" - dockerclicon "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + dockerclicon "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/volumecreate_vfile_test.go b/tests/e2e/volumecreate_vfile_test.go index bddcdd75e..754118f61 100644 --- a/tests/e2e/volumecreate_vfile_test.go +++ b/tests/e2e/volumecreate_vfile_test.go @@ -22,11 +22,11 @@ import ( "strings" "sync" - dockerclicon "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + dockerclicon "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/volumecreate_win_test.go b/tests/e2e/volumecreate_win_test.go index c62d9d42f..ef20168dc 100644 --- a/tests/e2e/volumecreate_win_test.go +++ b/tests/e2e/volumecreate_win_test.go @@ -18,7 +18,7 @@ package e2e -import "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" +import "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" var ( // invalidVolNameList is a slice of volume names for the TestInvalidName test. diff --git a/tests/e2e/volumecreatedefault_test.go b/tests/e2e/volumecreatedefault_test.go index b078f2618..ca29d3954 100644 --- a/tests/e2e/volumecreatedefault_test.go +++ b/tests/e2e/volumecreatedefault_test.go @@ -19,9 +19,9 @@ package e2e import ( - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/volumeproperty_test.go b/tests/e2e/volumeproperty_test.go index 49ee5d99f..93138a305 100644 --- a/tests/e2e/volumeproperty_test.go +++ b/tests/e2e/volumeproperty_test.go @@ -27,13 +27,13 @@ import ( "reflect" "strings" - dockerconst "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/constants/properties" - admincliconst "github.com/vmware/docker-volume-vsphere/tests/utils/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + dockerconst "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/properties" + admincliconst "github.com/vmware/vsphere-storage-for-docker/tests/utils/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" . "gopkg.in/check.v1" ) diff --git a/tests/e2e/vsan_test.go b/tests/e2e/vsan_test.go index f494a08d4..8864dfd0b 100644 --- a/tests/e2e/vsan_test.go +++ b/tests/e2e/vsan_test.go @@ -26,14 +26,14 @@ import ( "log" "strings" - adminclicon "github.com/vmware/docker-volume-vsphere/tests/constants/admincli" - dockerclicon "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/esx" - "github.com/vmware/docker-volume-vsphere/tests/utils/inputparams" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/verification" + adminclicon "github.com/vmware/vsphere-storage-for-docker/tests/constants/admincli" + dockerclicon "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/esx" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/inputparams" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/verification" . "gopkg.in/check.v1" ) diff --git a/tests/utils/admincli/cmd.go b/tests/utils/admincli/cmd.go index 30e775371..ebd735c98 100644 --- a/tests/utils/admincli/cmd.go +++ b/tests/utils/admincli/cmd.go @@ -20,8 +20,8 @@ import ( "log" "strings" - "github.com/vmware/docker-volume-vsphere/tests/constants/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) // CreatePolicy creates a policy diff --git a/tests/utils/admincli/service.go b/tests/utils/admincli/service.go index 8b980ed48..f6f84e2da 100644 --- a/tests/utils/admincli/service.go +++ b/tests/utils/admincli/service.go @@ -20,9 +20,9 @@ package admincli import ( "log" - "github.com/vmware/docker-volume-vsphere/tests/constants/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) // RestartVmdkopsService - restarts vmdkops service diff --git a/tests/utils/admincli/vmgroupmgmt.go b/tests/utils/admincli/vmgroupmgmt.go index 6231c46da..158ceeb8d 100644 --- a/tests/utils/admincli/vmgroupmgmt.go +++ b/tests/utils/admincli/vmgroupmgmt.go @@ -22,8 +22,8 @@ import ( "log" "strings" - "github.com/vmware/docker-volume-vsphere/tests/constants/admincli" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) // CreateVMgroup method is going to create a vmgroup and adds vm to it if vm name is passed. diff --git a/tests/utils/dockercli/containers.go b/tests/utils/dockercli/containers.go index 00e793da2..b3da285cb 100644 --- a/tests/utils/dockercli/containers.go +++ b/tests/utils/dockercli/containers.go @@ -21,8 +21,8 @@ import ( "log" "strings" - "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) // CONTAINER MGMT API diff --git a/tests/utils/dockercli/docker_mgmt.go b/tests/utils/dockercli/docker_mgmt.go index 5facee3d4..8f10a95d9 100644 --- a/tests/utils/dockercli/docker_mgmt.go +++ b/tests/utils/dockercli/docker_mgmt.go @@ -22,9 +22,9 @@ import ( "log" "strings" - "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) const ( @@ -51,7 +51,7 @@ func GetVDVSPlugin(ip string) (string, error) { func GetVDVSPID(ip string) (string, error) { out, err := ssh.InvokeCommand(ip, dockercli.GetVDVSPID) if err != nil { - log.Printf("Unable to get docker-volume-vsphere pid") + log.Printf("Unable to get vsphere-storage-for-docker pid") return "", err } return out, nil diff --git a/tests/utils/dockercli/swarm.go b/tests/utils/dockercli/swarm.go index 021b5b937..288bffb59 100644 --- a/tests/utils/dockercli/swarm.go +++ b/tests/utils/dockercli/swarm.go @@ -23,8 +23,8 @@ import ( "strconv" "strings" - "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) // ListContainers returns all running docker containers diff --git a/tests/utils/dockercli/volumelifecycle.go b/tests/utils/dockercli/volumelifecycle.go index 3a743467b..ad874821f 100644 --- a/tests/utils/dockercli/volumelifecycle.go +++ b/tests/utils/dockercli/volumelifecycle.go @@ -21,9 +21,9 @@ import ( "log" "strings" - "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) const ( diff --git a/tests/utils/esx/esxcli.go b/tests/utils/esx/esxcli.go index 506c1e4bb..ac24ba45e 100644 --- a/tests/utils/esx/esxcli.go +++ b/tests/utils/esx/esxcli.go @@ -25,10 +25,10 @@ package esx import ( "log" - "github.com/vmware/docker-volume-vsphere/tests/constants/esx" - "github.com/vmware/docker-volume-vsphere/tests/constants/properties" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/esx" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/properties" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) type getVMPowerStatus func(string) string diff --git a/tests/utils/esx/govc.go b/tests/utils/esx/govc.go index a3b579ec7..c0cfb896d 100644 --- a/tests/utils/esx/govc.go +++ b/tests/utils/esx/govc.go @@ -29,9 +29,9 @@ import ( "log" "strings" - "github.com/vmware/docker-volume-vsphere/tests/constants/esx" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/esx" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) const ( diff --git a/tests/utils/esx/vdvs.go b/tests/utils/esx/vdvs.go index 023ed2885..e6699e2cb 100644 --- a/tests/utils/esx/vdvs.go +++ b/tests/utils/esx/vdvs.go @@ -20,8 +20,8 @@ package esx import ( "log" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) // IsVDVSRunning checks if vDVS is running on given VM. This util can be @@ -33,9 +33,9 @@ func IsVDVSRunning(ip string) bool { waitTime := 3 for attempt := 0; attempt < maxAttempt; attempt++ { misc.SleepForSec(waitTime) - pid, _ := ssh.InvokeCommand(ip, "pidof docker-volume-vsphere") + pid, _ := ssh.InvokeCommand(ip, "pidof vsphere-storage-for-docker") if pid != "" { - log.Printf("Process ID of docker-volume-vsphere is: %s", pid) + log.Printf("Process ID of vsphere-storage-for-docker is: %s", pid) return true } } diff --git a/tests/utils/esx/vim_cmd.go b/tests/utils/esx/vim_cmd.go index b2f8a455c..8fe43df96 100644 --- a/tests/utils/esx/vim_cmd.go +++ b/tests/utils/esx/vim_cmd.go @@ -19,8 +19,8 @@ package esx import ( "fmt" - "github.com/vmware/docker-volume-vsphere/tests/constants/esx" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/esx" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) // SuspendResumeVM - suspend and resume a VM identified by name diff --git a/tests/utils/inputparams/testparams.go b/tests/utils/inputparams/testparams.go index 341dd5a70..c30c79a41 100644 --- a/tests/utils/inputparams/testparams.go +++ b/tests/utils/inputparams/testparams.go @@ -27,7 +27,7 @@ import ( "log" - "github.com/vmware/docker-volume-vsphere/tests/utils/esx" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/esx" ) // TestConfig - struct for common test configuration params diff --git a/tests/utils/verification/dockercontainer.go b/tests/utils/verification/dockercontainer.go index af4f59941..b8b6312af 100644 --- a/tests/utils/verification/dockercontainer.go +++ b/tests/utils/verification/dockercontainer.go @@ -22,8 +22,8 @@ import ( "strconv" "strings" - "github.com/vmware/docker-volume-vsphere/tests/utils/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" ) // IsDockerServiceRunning returns true if the given service is running on diff --git a/tests/utils/verification/dockerhost.go b/tests/utils/verification/dockerhost.go index bb1d55331..009cded99 100644 --- a/tests/utils/verification/dockerhost.go +++ b/tests/utils/verification/dockerhost.go @@ -22,9 +22,9 @@ import ( "strconv" "strings" - "github.com/vmware/docker-volume-vsphere/tests/constants/vm" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/vm" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) // CheckVolumeInProcMounts - check if volume entry is present in docker host mount file @@ -44,7 +44,7 @@ func CheckVolumeInProcMounts(hostName, volName string) bool { // CheckRefCount - check the log record for expected refcount of the volume. // grep does the work. If refcount isn't the expected one, err is not nil (Exit status 1) // logLines are number of log lines to be tailed from the log file. -// eg: tail -1 /var/log/docker-volume-vsphere.log | grep testName | grep -q refcount=5 +// eg: tail -1 /var/log/vsphere-storage-for-docker.log | grep testName | grep -q refcount=5 func CheckRefCount(hostName, volName string, logLines, expectedRefCnt int) bool { cmd := "tail -" + strconv.Itoa(logLines) + vm.LogFile + " | grep " + volName + " | grep -q refcount=" + strconv.Itoa(expectedRefCnt) @@ -61,7 +61,7 @@ func CheckRefCount(hostName, volName string, logLines, expectedRefCnt int) bool // checkRecoveryRecord - check the recovery record printed by plugin after restart // The log record must contain expected refcount // logLines are number of log lines to be tailed from the log file. -// eg: tail -50 /var/log/docker-volume-vsphere.log | grep 'Volume name=testName' | grep 'mounted=true' +// eg: tail -50 /var/log/vsphere-storage-for-docker.log | grep 'Volume name=testName' | grep 'mounted=true' func checkRecoveryRecord(hostName, volName string, logLines, expectedRefCnt int) bool { cmd := "tail -" + strconv.Itoa(logLines) + vm.LogFile + " | grep 'Volume name=" + volName + "' | grep 'mounted=true'" diff --git a/tests/utils/verification/volumeproperties.go b/tests/utils/verification/volumeproperties.go index eff53136d..a21f5eef1 100644 --- a/tests/utils/verification/volumeproperties.go +++ b/tests/utils/verification/volumeproperties.go @@ -24,12 +24,12 @@ import ( "log" "strings" - "github.com/vmware/docker-volume-vsphere/tests/constants/admincli" - "github.com/vmware/docker-volume-vsphere/tests/constants/dockercli" - "github.com/vmware/docker-volume-vsphere/tests/constants/properties" - "github.com/vmware/docker-volume-vsphere/tests/utils/esx" - "github.com/vmware/docker-volume-vsphere/tests/utils/misc" - "github.com/vmware/docker-volume-vsphere/tests/utils/ssh" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/admincli" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/dockercli" + "github.com/vmware/vsphere-storage-for-docker/tests/constants/properties" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/esx" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/misc" + "github.com/vmware/vsphere-storage-for-docker/tests/utils/ssh" ) // GetVMAttachedToVolUsingDockerCli returns attached to vm field of volume using docker cli diff --git a/ui/README.md b/ui/README.md index 69430ec9e..1e935fc93 100644 --- a/ui/README.md +++ b/ui/README.md @@ -1,6 +1,6 @@ -docker-volume-vsphere ESX UI Plugin +vsphere-storage-for-docker ESX UI Plugin =============================== -- ESX UI Plugin is installed automatically with the docker-volume-vsphere Plugin +- ESX UI Plugin is installed automatically with the vsphere-storage-for-docker Plugin - see the local Makefile as a starting point for understanding the ESX UI Plugin build process diff --git a/ui/package.json b/ui/package.json index 17b19dfea..4192398fe 100644 --- a/ui/package.json +++ b/ui/package.json @@ -14,11 +14,11 @@ }, "repository" : { "type" : "git", - "url" : "https://github.com/vmware/docker-volume-vsphere.git" + "url" : "https://github.com/vmware/vsphere-storage-for-docker.git" }, "author": { "name": "SABU, VMware", "email": "cna-storage@vmware.com", - "url": "https://github.com/vmware/docker-volume-vsphere" + "url": "https://github.com/vmware/vsphere-storage-for-docker" } } diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/malevolent-certs/ca.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/malevolent-certs/ca.pem new file mode 100644 index 000000000..93325986a --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/malevolent-certs/ca.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC9TCCAd+gAwIBAgIQKQTGjKpSVBW78ef0fOcxRTALBgkqhkiG9w0BAQswJjER +MA8GA1UEChMIUXVpY2tUTFMxETAPBgNVBAMTCFF1aWNrVExTMB4XDTE1MDgyMDIz +MjE0OVoXDTE4MDgwNDIzMjE0OVowJjERMA8GA1UEChMIUXVpY2tUTFMxETAPBgNV +BAMTCFF1aWNrVExTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwoPM +xiDZK6Fwy5r3waRkfJHhyZZH828Jyj+nz5UVkMyOM/xN6MgJ2w911hTj1wSXG2n3 +AohF3gTFNrDYh4j2qRZnixDrOM5GBm2/KJbyfBIYkrR45yLfjidO7MRnhaPZ5Fov +l+RKwNBXP4Q2mUe7q9FM457Rm8hAcqXP04AJT20m1QSYQivDgxsDxuAQte3VEy1E +0j0CwUKoFHT6MHOnDPEZbc4r1+ba34WBM1Sc5KXyV2JlbtU07J4hACYWVsD7vQCl +VFlZNE4E35ahMDZ+ODLal9PAT8ARLdAtjvRWrT+h8qZ4Yfwt/sGF1K4CAkTP3H5p +uMkJG56zmqIEYeHMuwIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAKQwDwYDVR0TAQH/ +BAUwAwEB/zALBgkqhkiG9w0BAQsDggEBALpieTckiPEeb3rTAWl7waDPLPOIhS5C +XHVfOm7cPmRn3pT2VuR8y74U7a1uOkYMgJnCWb8lSXhbqC89FatLnAhKqo4I9oD8 +2BXgYeIpP5/OWBcjzmsMnowrvokc0chAmAR0Ux6AP0eX9amC0lGMuTHdw3+is0AR +lhoImOUPXvgMH7W2RimpSgnX0R5wKqfuGwMfbGa0xhWBZ+wekAKcU8b+pIHDyX0c +EQcir2y8/lVjECXSAIlV6iasPQ3hm1sd0xq1hx4yrwYFvQb7yEhOXbK24HLr/20D +RRmEOuS8gg2XtUFv66z/VOw/nUleIg9GAuWDJaiu9frmIma4/tIY4qY= +-----END CERTIFICATE----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+ca.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+ca.pem new file mode 100644 index 000000000..8c9b1bca3 --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+ca.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE9TCCAt+gAwIBAgIQMsdPWoLAso/tIOvLk8R/sDALBgkqhkiG9w0BAQswJjER +MA8GA1UEChMIUXVpY2tUTFMxETAPBgNVBAMTCFF1aWNrVExTMB4XDTE1MDUyNjIw +NTQwMVoXDTE4MDUxMDIwNTQwMVowJjERMA8GA1UEChMIUXVpY2tUTFMxETAPBgNV +BAMTCFF1aWNrVExTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1YeX +GTvXPKlWA2lMbCvIGB9JYld/otf8aqs6euVJK1f09ngj5b6VoVlI8o1ScVcHKlKx +BGfPMThnM7fiEmsfDSPuCIlGmTqR0t4t9dHRnLBGbZmR8JdAs7LKpP+PFYu0JTIT +wFcjXIs+45cIF2HpsYY6zkj0bmNsyYmT1U1BTW+qqmhvc0Jkr+ikElOQ93Pn7zIO +cXtxdERdzdzXY5cfL3CCaoJDgXOsKPQfYrCi5Zl6sLZVBkIc6Q2fErSIjTp45+NY +AjiOxfUT0MOFtA0/HzYvVp3gTNPGEWM3dF1hwzCqJ32odbw/3TiFCEeC1B82p1sR +sgoFZ6Vbfy9fMhB5S7BBtbqF09Yq/PMM3drOvWIxMF4aOY55ilrtKVwmnckiB0mE +CPOColUUyiWIwwvp82InYsX5ekfS4x1mX1iz8zQEuTF5QHdKiUfd4A33ZMf0Ve6p +y9SaMmos99uVQMzWlwj7nVACXjb9Ee6MY/ePRl7Z2gBxEYV41SGFRg8LNkQ//fYk +o2vJ4Bp4aOh/O3ZQNv1eqEDmf/Su5lYCzURyQ2srcRRdwpteDPX+NHYn2d07knHN +NQvOJn6EkcsDbgp0vSr6mFDv2GZWkTOAd8jZyrcErrLHAxRNm0Va+CEIKLhswf1G +Y2kFkPL1otI8OSDvdJSjZ2GjRSwXhM2Mf3PzfAkCAwEAAaMjMCEwDgYDVR0PAQH/ +BAQDAgCkMA8GA1UdEwEB/wQFMAMBAf8wCwYJKoZIhvcNAQELA4ICAQDBxOHKnF9z +PZWPNKDRmBPtmnU2IHh6JJ9HzqGALJJbBU0MUSD/aLBBkYeS0YSHgYZ1hXLsfuRU +lm/czV41hU1FTDqS2fFpcAAGH+6/rwyfrz+GYr2K4b/ijCwOMbMrDWO54zqZT3KU +GFBpkrh4fNyKdgUNJsy0Q0it3gOGSUmLvEQUzqxPFVz7h/pF/Cecr0/kpjbpsxna +XQkhtDyKDIQfPCq8Ci1vox5WvBbBkdzDtyCm+KSb6VC3pCX6LV5NkS7YM7mtscTi +QdYfLbKX05kUVG2R9SShJn5BSXzGk9M5FR5koGY0lMHwmJqaOqazXjqa1jR7UNDK +UyExHIXSqJ+nCf4bChEsaC1uwu3Gr7PfP41Zb2U3Raf8UmFnbz6Hx0sS4zBvyJ5w +Ntemve4M1mB7++oLZ4PkuwK82SkQ8YK0z+lGJQRjg/HP3fVETV8TlIPJAvg7bRnH +sMrLb/V+K6iY+08kQ2rpU02itRjKnU/DLoha4KVjafY8eIcIR2lpwrYjx+KYpkcF +AMEC7MnuzhyUfDL++GO6XGwRnx2E54MnKtkrECObMSzwuLysPmjhrEUH6YR7zGib +KmN6vQkA4s5053R+Tu0k1JGaw90SfvcW4bxGcFjU4Kg0KqlY1y8tnt+ZiHmK0naA +KauB3KY1NiL+Ng5DCzNdkwDkWH78ZguI2w== +-----END CERTIFICATE----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+client-cert.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+client-cert.pem new file mode 100644 index 000000000..a239939d0 --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+client-cert.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE9TCCAt+gAwIBAgIRAKbgxG1zgQI81ISaHxqLfpcwCwYJKoZIhvcNAQELMCYx +ETAPBgNVBAoTCFF1aWNrVExTMREwDwYDVQQDEwhRdWlja1RMUzAeFw0xNTA1MjYy +MDU0MjJaFw0xODA1MTAyMDU0MjJaMBMxETAPBgNVBAoTCFF1aWNrVExTMIICIjAN +BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq0Pc8DQ9AyvokFzm9v4a+29TCA3/ +oARHbx59G+GOeGkrwG6ZWSZa/oNEJf3NJcU00V04k+fQuVoYBCgBXec9TEBvXa8M +WpLxp5U9LyYkv0AiSPfT2fJEE8mC+isMl+DbmgBcShwRXpeZQyIbEJhedS8mIjW/ +MgJbdTylEq1UcZSLMuky+RWv10dw02fLuN1302OgfJRZooPug9rPYHHGbTB0o7II +hGlhziLVTKV9W1RP8Aop8TamSD85OV6shDaCvmMFr1YNDjcJJ5MGMaSmq0Krq9v4 +nFwmuhOo8gvw/HhzYcxyMHnqMt6EgvbVWwXOoW7xiI3BEDFV33xgTp61bFpcdCai +gwUNzfe4/dHeCk/r3pteWOxH1bvcxUlmUB65wjRAwKuIX8Z0hC4ZlM30o+z11Aru +5QqKMrbSlOcd6yHT6NM1ZRyD+nbFORqB8W51g344eYl0zqQjxTQ0TNjJWDR2RWB/ +Vlp5N+WRjDpsBscR8kt2Q1My17gWzvHfijGETZpbvmo2f+Keqc9fcfzkIe/VZFoO +nhRqhl2PSphcWdimk8Bwf5jC2uDAXWCdvVWvRSP4Xg8zpDwLhlsfLaWVH9n+WG3j +NLQ8EmHWaZlJSeW4BiDYsXmpTAkeLmwoS+pk2WL0TSQ7+S3DyrmTeVANHipNQZeB +twZJXIXR6Jc8hgsCAwEAAaM1MDMwDgYDVR0PAQH/BAQDAgCgMBMGA1UdJQQMMAoG +CCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwCwYJKoZIhvcNAQELA4ICAQCl0cTLbLIn +XFuxreei+y6TlG2Z5XcxJ84mr8VLAaQMlJOLZV0O/suFBu9KqBuvPaHhGRnKE2uw +Vxdj9qaDdvmvuzi4jYyUA/sQuqq1+wHwGTadOi9r0IsL8OxzsG16OlhuXzhoQVdw +C9z1jad4HC7uihQ5yhl2ltAA+h5G0Sr1b9El2mx4p6BV+okmTvrqrmjshQb1GZwx +jG6SJ/uvjGf7rn09ZyYafF9ZDTMNodNXjW8orqGlFdXZLPFJ9agUFfwWfqD2lrtm +Fu+Ei0ZvKOtyzmh06eO2aGAHJCBTfcDM4tBKBKp0MOMoZkcQQDNpSyI12j6s1wtx +/1dC8QDyfFpZFXTbKn3q+6MpR+u5zqVquYjwP5DqGTvX0e1sLSthv7LRiOi0qHv1 +bZ8JoWhRMNumui9mzwar5t20ExcWxGxizZY+t+OIj4kaAeRoKK6r6FrYBnTjM+iR ++xtML5UHPOSmYfNcai0Wn4T7hwpgnCJ+K7qGYjFUCarsINppQEwkxHAvuX+asc38 +nA0wd7ByulkMJph0gP6j6LuJf28JODi6EQ7FcQItMeTuPrc+mpqJ4jP7vTTSJG7Q +wvqXLMgFQFR+2PG0s10hbY/Y/nwZAROfAs7ADED+EcDPTl/+XjVyo/aYIeOb/07W +SpS/cacZYUsSLgB4cWbxElcc/p7CW1PbOA== +-----END CERTIFICATE----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+client-key.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+client-key.pem new file mode 100644 index 000000000..acfc9a487 --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+client-key.pem @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localhost-cert.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localhost-cert.pem new file mode 100644 index 000000000..3ca47f458 --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localhost-cert.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIFCTCCAvOgAwIBAgIQdcXDOHrLsd2ENSfj5h8ZmjALBgkqhkiG9w0BAQswJjER +MA8GA1UEChMIUXVpY2tUTFMxETAPBgNVBAMTCFF1aWNrVExTMB4XDTE1MDUyNjIw +NTQwM1oXDTE4MDUxMDIwNTQwM1owJzERMA8GA1UEChMIUXVpY2tUTFMxEjAQBgNV +BAMTCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK2K +saEVcHq0eldu5kABbWtZsf9keK7lz8beVIowzOqp5IHpGlggtH7xDVeigA/sLdds +WTgKEOq3zsJzdgfEti5TNAjjmPqjMKkolqv3LXDJG0dZ2GZ8W/eBB6X1wB0LKr3i +ye3/5jb/wCZYVGGMQXj0VQxY8Qq+OHEp0effeheJqA0OYOj+RaZwi20OR/KmJRgY +wXU33bZyapuyT4krhFlFbtzXeKsKQPrT2ePWxPAceqUGUTIqyJySYIw6vb72YxjX +FNRw6Jg7B7RqVJaVCfBrVxtAv+rCLOhUOVYmWhgWEIODPXiqOGwB0VUApAVAYqfi +TYnJIZ7QYLlQx5VPNlzZuSJTUzKmHQLtLcTqdO5HmLxfxc0WuS/ftK916wy/jpSc +m2DiHjIy6aAEaHKGQrNgT+no68kp30xkYAVsIs0BFpl6Q2iNr5e0uKta82A0xU1Q +we7swSHOHCevuDZfFA/CqnBptOjvNUuVytcroCeCrV/ftp75w/Fd9zOcb6LGLxM2 +2UzhkSXl3II250xj74Q3q8T9TDxCLty7oiawhaYKI+8SDYc510EQ7MH46WMO+3Uq +JkpmmELd9POgnnZ1JrCFmf0flUKTi2CqU3wrBPpPMwFBxoFipp5iL87npACHc3DY +6uaoF4Pf9Et1Fd7HRon8RMsKkrSF92NFiBx5UvhZAgMBAAGjNjA0MA4GA1UdDwEB +/wQEAwIAoDAMBgNVHRMBAf8EAjAAMBQGA1UdEQQNMAuCCWxvY2FsaG9zdDALBgkq +hkiG9w0BAQsDggIBAC0F4ci1nqZ9KUhEEAmWmy8g89DovNNIGSC51r2WJ/COmYUX +X70TONscsBL/kx5MK4xoAmb+EN6Yy8i+z9NkNJd0B+2MjXPMFBpgGb0UiPv2wEmZ +5PAKyjwTxNIm6L/nFhkmVqfsQHfjHukXES4C0ff6fj6fuDpBfl5nTlVmc9LpP+hT +5RAwW10qumucGxAWGNBWW+K66cf8O7n/0nQykxJxYjBx16ZB80H2uvqFDKDVFqze +co5M4euXQq9KiXPRlcC9rab2a7FGLHd0TyPkq6TvfsqpxcryyKS4rIAz3sQh/tl/ +/qm1tBcZW2bce3UlF2Wb2dW9HqvIu1O84f6ptLqwgKcIdTbwgQZ0kbFoWE2kWJSV +w+eAFb7tz1LDTpF3NRlz+1K27pBQWRQgcqoIRoQXpC0LfQY9Mp70QIfUQdUh6tnO +8hmq5y623tfxiDwCxb/EOpwCmwK1Cp9cloZTDefVE1r6NkEJWeeHG79VljUGF1KT +NKzXWrrsFtge/hU9Pj+frcZO9qExxPCcsrdZcoK7Ll8s+pjulRvbnCnJkNpeOI3P +iz6+sdGmzKSKg2daRM67Zmy5tmlBEX/eV7kFqt+b3HsdUiLo3Ng2lyPLNNDfwUtB +EukgYGjVJoyqLjLXgsCxLJlk7X/ogVwf8SlAnQ7p6KuxGWm02vlUpEmJp+Hq +-----END CERTIFICATE----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localhost-key.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localhost-key.pem new file mode 100644 index 000000000..baccc9eb8 --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localhost-key.pem @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localregistry-cert.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localregistry-cert.pem new file mode 100644 index 000000000..ee72c0c6e --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localregistry-cert.pem @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIFETCCAvugAwIBAgIQJ+iLgsp9gA0DmROqW+tHFzALBgkqhkiG9w0BAQswJjER +MA8GA1UEChMIUXVpY2tUTFMxETAPBgNVBAMTCFF1aWNrVExTMB4XDTE1MDUyNjIw +NTQxNloXDTE4MDUxMDIwNTQxNlowKzERMA8GA1UEChMIUXVpY2tUTFMxFjAUBgNV +BAMTDWxvY2FscmVnaXN0cnkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC +AQDHR/A6uiQ9X/Xh5ivmdjRr5XVr1D7+fU9Qu6ohArqtBuJsLr6t2RBTS9w6PIAf +xjQSMSFlrm/CY+hbfBMSgm9NeH23o3kYCgoEPhP/634A45W5xwUFno388U8/NHK7 +qwzSP1ezKXfXNvzuo1mZhT08aVdGMOrZUcZZZl8R3RPcIRw9XDSfXKVkMluH6egk +8iLdOxdIdRS58DeSI09FskWe3cIZ5kJmMqnKoIbYSJCVVeYPO0RFlIBi+zpdVyI/ +r9LG0r0plRdz/HJevbOitU2y93S1s9NWMNEkOFU1PFJmsF3ZzNqJFCySj00y/Hcs +jPULYwIxYdqcv16cTNmd3P6FegvuzLJLjNuGaLJGc1antv+p62P7ZdE3DyprFuxs +MJgDL9+NjDaIzoamFf0Uv7K3F7hxrrAHfvm1CMUOyQLg9J6Wl4mLsOy2ZhCbdNFs +T6dobAUGvz4Muj9V8V5pR+nFehjmsPENSsTcs5j0e8zTWtvMFISdS+NZAkpiz0s4 +PV8DLgk5Rp1ZG2V5OnRPLMOTgK0nngc5GVaxf7OYCrFHbBJ8tL93MXNQptNFeBpV +FhjUGqVFcz+6nbFX2NsFLZnghQRs9lej4TTG33NSAYusKqhVwpYFf8CsXCcvYuU6 +RlkCYjr3PB+nX1UDa0eUGm0zOabf9O3D1VzHQBpDuzSHQwIDAQABozowODAOBgNV +HQ8BAf8EBAMCAKAwDAYDVR0TAQH/BAIwADAYBgNVHREEETAPgg1sb2NhbHJlZ2lz +dHJ5MAsGCSqGSIb3DQEBCwOCAgEAaPfAs6saij4FZIPbzAb5M6ZVvfXBg+AfH52t +p3tFsnWUJCiOh9ywsc2NcmJdleKDc4/spElFMUarHqcE1ua6EH15O5GEnHWKj8EY +PVQFrPvf30UkRGNPl8eC7afZtCNk9MLllIATAzBr5Z1i+psV7MmgBKpbZ4B0TnhR +GXNT60QaCJ9RfUuc2z7RHJNo9XTn3Q44X7TFj+P3jHOWzTf8y6Mz6saTy2bugIUy +AfRgRgq/bB8hRjrazg55FIlrMv7dr3J0cIuqmaHfsw7Q2ECMCXW8oQXMBzfuIT0n +sG4u0oVxdNx4OdHsAubGjjwNDhxJvN5j8+YFqZMu03i8LbyamTwsrZg2C3QrRUq8 +SujQEEB+AmO0lpuJ24FsOOYVSYCpLy2ugrKOr2NUqbiBKZs8uBh6RGACfunMZlEw +4BntohiO7oZ5gjvhGZNUEqzMChw7knvVjZ+DkhFk9yE4qIL7VsJSUNI2ZJym/Xeq +jr/oT8CpP8/mFZspa6DFciPfhGLQqKcaZZohL7461pOYWY5C2vsJNR2ucBZzTFvD +BiN/rMnIGFrxUscCCje6RLmrsZ3Lb7bfhB3W6kwzLRfr/XEygAzx6S2mlOM34kqF +HFpKrg9TtLIpYLAKAIfuNbrLaNP1UKh7iLarhDz/qDcvRka/qJTzLD3eLeGXefAP +KjJ1S7s= +-----END CERTIFICATE----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localregistry-key.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localregistry-key.pem new file mode 100644 index 000000000..d20bda0ce --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-ca+localregistry-key.pem @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+client-cert.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+client-cert.pem new file mode 100644 index 000000000..ef030f740 --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+client-cert.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE9DCCAt6gAwIBAgIQb58oJ+9SvWUCcYWA+L1oiTALBgkqhkiG9w0BAQswJjER +MA8GA1UEChMIUXVpY2tUTFMxETAPBgNVBAMTCFF1aWNrVExTMB4XDTE1MDUyNjIw +NTUwMFoXDTE4MDUxMDIwNTUwMFowEzERMA8GA1UEChMIUXVpY2tUTFMwggIiMA0G +CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDDmOL3EhBm4So3agPMmF0z1+/nPlrE +xoG7x0HYPk5CP3PF3TNVk3ArBPkMzge0/895a4ZEb9j+LUQEjOZa/ZwuLmSjfJSt +9xTXI1ldp8KasyzQZjC33/bUj7FGxGzgbHyJrGGBoH2W5HdswH4WzhCnGTslyiDo +VN4hklJ7gr+Geq3TPf8Eji+1L71MOrUyoNp7BaQBQT/gKxK0nV+ZuSk6eaiu+om7 +slp3x4bc21o7eIMmNXggJP6p9fMDctnioKhAPcm+5ADiFYSjivLeUQ85VkMTpmdU +yvq6ziK3Ls6erD+S3xLvcHYAaeu84qLd7qdPwkHMTQsDpO4vPMIwL8piMzZV+kwL +Bq+5xk5//FwnQH0pSo2Nr4vRn+DITZc3GKyGUJQoOUgAdfGNskTt8GXa4IsHn5iw +zr12vGaxb//GDm0RLHnh7NVbD8xxDHIJq+fJNFb7MdXa8v31PYebkWuaPhYt6HQC +I/D81zwcJIOGfzNITS2ifM5tvMaUXireo4pLC2v2aSY6RrPq1owlB6jGFwGwZSAF +O6rxSqWO1gLfhJLzqcw/NjWnO7nCZEs/iKgAa22K2CtTt3dDMTvSBYKdkRe/FYQC +MCa7MFJSaH85pYRzoDN4IuVpvROrtuQmlI47oZzb64uCPoA4A8AN+k8iysqITsgK +1m8ePPXhbu4YlwIDAQABozUwMzAOBgNVHQ8BAf8EBAMCAKAwEwYDVR0lBAwwCgYI +KwYBBQUHAwIwDAYDVR0TAQH/BAIwADALBgkqhkiG9w0BAQsDggIBALSgrCdEQd3I +vb/FNkNZkAwdjfBD6j7ZtPBwvjEiiyNTx9hOLBGvbey7kr0HtW0KkLWsdRmCc+3z +ev9I5VjDOtpiqrvuAA1wRBaL3UzGyj/eFjPJpvkfJi8zjkIZ2y18QG3yJ6Eqy6dD +0aIQAHl9hkXMOVrf364gf0p7EoOGtSlfQ56yIGDPTFKKiy+Al0S42p17lhI4coz9 +zGXE1/SiNeZgdsk4zHDqhzzBp8foZuSL1sGcIXHkG8RtqZ1WvCyIPYRyIjIKZcXd +JCEM//EbgDzQ7VE/jm+hIlYfPjM7fmUzsfii+bIrp/0HGEU3HN++LsA6eQOwWPa/ +PrxKPP36EVXb72QK8C3lmz6y+CHhuuAm0C1b1qmYVEs4eRE21S8eB2l0KUlfOecf +xZ1LWp1agKt6fGqRgcsR3/qO27l8W7hlbFNPeOTgr6NQQkEMRW5OxbnZ58ULXqr3 +gWh8Na3D4+3j53035UBBQUMmeeFfWCvtr5n0+6BTAi62Cwwu9QQQBM/2f9/9K+B7 +cW0xPYtczm+VwJL6/rDtNN9xPWitxab1dkZp2XcHG3VWtYvE2R2EtEoKvvCLPggx +zcafsZfcD1wlvtQF7YjykGJnMa0SB0GBl9SQtvGc8PkP39yXHqXZhIoo3fp4qm9v +RfbdpOr8p/Ks34ZqQPukFwpM1s/6aicF +-----END CERTIFICATE----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+client-key.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+client-key.pem new file mode 100644 index 000000000..5aee3ea5f --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+client-key.pem @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localhost-cert.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localhost-cert.pem new file mode 100644 index 000000000..53ce07422 --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localhost-cert.pem @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIFCTCCAvOgAwIBAgIQPjclBRGzhznCybQzYRQTyjALBgkqhkiG9w0BAQswJjER +MA8GA1UEChMIUXVpY2tUTFMxETAPBgNVBAMTCFF1aWNrVExTMB4XDTE1MDUyNjIw +NTQ1NloXDTE4MDUxMDIwNTQ1NlowJzERMA8GA1UEChMIUXVpY2tUTFMxEjAQBgNV +BAMTCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALBe +C9O6es+mStDowUd1kiM59VkinzzdHgE24LvKmGxQ6fDnnT8S9L7iyzoxcJWlvSHu +pfyZWvij0ZIyRZ288XemTEFYq25RK0IBGGdvYz9OqT2R3lblBQrXDjSi9WG16sGx +60MGhM2egGMqFQ5DBfT16IKw00+RjFgCVzJ8T64Lzw82E0e7d6hl39SPybY+uvrt +SID60hYGmXoOdaiC9qquivks67BZprGNfORrvyJNrCFI6oKUFWHrQ1PpGd2tOwJN +1P3gkkS8pVlAif6ZQkAf+zuKu+l4j5tKxGlJAkJsafVJDLOxBKutUj5msha0g6uJ +gFXUe0+G8hkNcEjd8XqUUCwIOY3pdv4WsydKBk3uH9zMnYolw53k1q0ObvoY1NXf +beMxHQAtDi7nfQGlae9cuuOSymy95WuvzfhZFKdPWUe8lKN9QXFIWVoCFnOm8T3P ++FNCUE+p8DIWkal6Ul9THi/Kz4p7twyrUp1LwT5EtSaJ3iGAmB9I+8/1vmZT3lPi +nX8P+iVGM5yOUnptrsFm0bUcJWRD6iaTK1KxpH+Is4h2kiUiSz1tC/9bKaJYN2o9 +oy7q7+ZVfHSmIxLo8ZFYsaZBcXi96cKuuPMR3X4ISPwKDqP5irxU/QbI+YQBMshg +G4b0BNoMZ50g30r3Hcsifw4pzPQF0RDMOBeCiOi3AgMBAAGjNjA0MA4GA1UdDwEB +/wQEAwIAoDAMBgNVHRMBAf8EAjAAMBQGA1UdEQQNMAuCCWxvY2FsaG9zdDALBgkq +hkiG9w0BAQsDggIBAFuS/VrMNUwEMyUIktDyna5ExYh/FDOE+YEYf8tsX7dSMhRK +wE560/AcVZcbKKAZOnZ/262a++8tparsQt+bXBJ2so6YUqsFDNdOLCI2aShjWDRe +TNhqmLIO3FNsLRKp96WHVz+jFoiECsoYfKn0jgqTqxx+7nWFqgBaNSlF5cbCgLCH +jQV1uQhzsw/Mh/32hXAidkv/nLeLf7FbKq08hgthtoP+XstlzZ5BxkPodjb8XWXG +DSS49SWX971GHa1apwMKfxVGSppxn18ZwEmW1BUfQBNxtMytqA9DK3+xuoUdXkB0 +iJbm3Jc10JSRju8iyL121Xt6f8O33paVz/ndDJIWztUOjnItc89rxHsINPt5+cUt +jix8ohwmHGDrK7ZooXBvotvmGT/xhPr2eHUAG8JuSJ/Cr09UUOwUEigz4CfgJOHm +XukdzjOkb4r7lhNmVeGqrjRol1W0Wsc1NGH++J6xdkIeQ+i23kHwFHfQWV/J69tm +rOn2N+qijtmbIy9YfVcrFDtUtEAzXylZ2StCVQNofd0M7tXNdrUL8yAFwlrhWGJV +wsSP++1xH2Ie6Diupy8z6rbP383HmnmVPU/UecgLrlX2lEpt/UZkkX1Xm+6PhrrT +HDeeULvqtUP3PD8wS0C873Pl9GXOKISqf0HKEIDUAVZhQOsGFqiZH0388M4L +-----END CERTIFICATE----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localhost-key.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localhost-key.pem new file mode 100644 index 000000000..636dc8287 --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localhost-key.pem @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localregistry-cert.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localregistry-cert.pem new file mode 100644 index 000000000..08c393d1b --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localregistry-cert.pem @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIFETCCAvugAwIBAgIQCnqSQalw9ytL5bHLgHZe+jALBgkqhkiG9w0BAQswJjER +MA8GA1UEChMIUXVpY2tUTFMxETAPBgNVBAMTCFF1aWNrVExTMB4XDTE1MDUyNjIw +NTQ1OFoXDTE4MDUxMDIwNTQ1OFowKzERMA8GA1UEChMIUXVpY2tUTFMxFjAUBgNV +BAMTDWxvY2FscmVnaXN0cnkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC +AQC9gvT3cwz0Ih9+7Ilv5lc15HsEiSmEMh4nOMZrSaamKgf/ydCiGo3DQapr/XDK +FHMLKq68AxwfOlzmEFQ4d9umpPMQ2+4GBr0VG23ppGtQApIPHgD06S0/CeHmDIXN +FXcKybPX/9KbgNkXBWbbJkJy0EcsdP8VJD50Q2WH89nvgEYJNFuKEELD3iGY6bBF +jeDTle5jYA7CgBKvD2avn31g24Qhxn8n8/BdYO/U0kw0qmoy1veLOjCAW0os0jkM +NlKrFpyHEWNj5B3X6UgSn8EGQaVbDq17PrQwlHJYU4nih0TnD1OwvBnFnd27pXjr +68eGA6Zc2BbUnhNGhppWHZ46LpPxpIbafSOH3ES3N/MZAfcUKIUntLlWE2xCQgFV +TW95WeVtP/r1aWgIHu0E2Jb2eHCE+qXYqJxSU7S4DcknmmcTS69hzyHs+92Ec+7Q +m0aQFZ0dyPoYPwXMgZpTAIuXEGg/FKC1fiS/deTW37DyvB2jppehKW3RJY3uso7R +o9vs6DJx1OdU5XEq9R3n7op61N7PK8Wxmn7TVYHEZHkITVvtucZZd1FNTOrOJaNJ +UnE+FuPK1Mrff+jz666Ru4zQL0CondOamX3QR5tuNK6MTqFs87wKY25qsqz7cS27 +kHW+r7UNWbJY3/UQhaPZM78zCZa2IL1nBFUjsFvEA4rtYwIDAQABozowODAOBgNV +HQ8BAf8EBAMCAKAwDAYDVR0TAQH/BAIwADAYBgNVHREEETAPgg1sb2NhbHJlZ2lz +dHJ5MAsGCSqGSIb3DQEBCwOCAgEAHVGMyoyX4lRzWCDkUjrXkrDZzuv03M2ojW2Q +UL61ejMkTWQW8R4gKrcPHAOJAPKVfGEVOrQH3ZMyxV2HnWrJ7egrn65zOzmLbWSh +O7gdpL6YYjBr218fqJn/8HadXZa4k70JyympYOLojeWSLy3KP03U+y7AMcdE1uG6 +6HJI54ZjBoW/nEyWmMh/mfMz8EN+Mgek48Z9AVaOswbtHtDIXN7XO0jbB3DbY5Yh +prVqVLYAz4sCchGTadj+aEChF5sJkKREDvAew/njC0WGS2TmMJ+V1uVhXV6354mr +edk79YvdwzwDgeYArkprahMtn9eu1aSTfUXsmM5OP5tR4gyFV1kUmTPY1yUd/yO+ +638wV0mWtGbbf6j8dUKeUBCyt2qGg8J80OUeFdvdHMswtaUq951NApX44BinPkbK +moBVQByZ5OEcmMidFC9SqYSUwTQ7uNyWeguhCXav+l3x900YlKnUQgRUZntPwXjs +yc7MXv0j0E86Gme6G1O02zamwkRgr3qOTHu2oQOow/a24fM4HASayLR0Kegt0sh3 +rzk0HRF1mGonf1Ecyyj/3LpHVsgYSckwtJoZLOqtDMn+CKtOCEByssQfD+E9Qe07 +qMyvcwpXUpfqe3ZERbJ10m98Z88VeK/XGt9ptq7HY47n1KL6lx3oyXwZIw8pq928 +89dcqL0= +-----END CERTIFICATE----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localregistry-key.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localregistry-key.pem new file mode 100644 index 000000000..205511afb --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/nginx/ssl/registry-noca+localregistry-key.pem @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/tokenserver-oauth/certs/ca.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/tokenserver-oauth/certs/ca.pem new file mode 100644 index 000000000..0b585b3f2 --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/tokenserver-oauth/certs/ca.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC9TCCAd+gAwIBAgIQNS9SaFSFBN7Zvwjalrf2DDALBgkqhkiG9w0BAQswJjER +MA8GA1UEChMIUXVpY2tUTFMxETAPBgNVBAMTCFF1aWNrVExTMB4XDTE2MDEyODAw +NDIzMFoXDTE5MDExMjAwNDIzMFowJjERMA8GA1UEChMIUXVpY2tUTFMxETAPBgNV +BAMTCFF1aWNrVExTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu/Pf +fQ7VUTSXs12PRyrLDVDz7kPDbGNTt0vF7FYDmTTGOU3i62xZNOGuxBezAiVSV5A3 +lopwsv4OH7DRtSaPn+XCt1JDALna2WrjT0MshypMd5o2c3jmGUfAKf5gjizgIoEl +d4e5aqEBuOQP+QCEde+8p8N1buQW+zMy9srM2O/7BFMIaQ07CWLlj3hIiF+L5rKD +L6dWtKT7INRmRwpuZZnThEWnBSNgayrWek6G0i3y8QYTfVA1SwA+H3grJxy5NrLp +GYXSmu2509mu0QAHhx05t1rJhwhFz/4sG7j8AggYeDXEqfQ/VIb/bvnW9bD+vrQ2 +ZnICvxnzNMYBx23BkQIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAKQwDwYDVR0TAQH/ +BAUwAwEB/zALBgkqhkiG9w0BAQsDggEBALvTi6E44Fltu83dFLVEj0kLtusI/TTH +Tw6upoB5pRG+7A75w0Ii8bvvd2tNpBOg+L+80xyIFqaNkXhLKTN4lgtd7WiCuyb/ +w1BEuF/+RjCXhu6wQ/63ab46d6ctaQ1zjxlU2rQLQXQFALI8ntyn/TELc01HYkr2 +x3NHlbnBNlgI2CKXPeUBzvBylTCcdYGwoa+2ZPdIsFjle2aCIBoZ+WNZlIbFwgLh +XCHwcbviC+thjqOneJpJZmRW9AxQ638ki6iGItdrJewCN/1dcL2KKjxnC5VHbpne +SOjEPNXihY08Brl8myhFNtRRKZ55MJIYzDtVQSkCaT91Q3XX9tSZadY= +-----END CERTIFICATE----- diff --git a/vendor/github.com/docker/distribution/contrib/docker-integration/tokenserver/certs/ca.pem b/vendor/github.com/docker/distribution/contrib/docker-integration/tokenserver/certs/ca.pem new file mode 100644 index 000000000..0b585b3f2 --- /dev/null +++ b/vendor/github.com/docker/distribution/contrib/docker-integration/tokenserver/certs/ca.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC9TCCAd+gAwIBAgIQNS9SaFSFBN7Zvwjalrf2DDALBgkqhkiG9w0BAQswJjER +MA8GA1UEChMIUXVpY2tUTFMxETAPBgNVBAMTCFF1aWNrVExTMB4XDTE2MDEyODAw +NDIzMFoXDTE5MDExMjAwNDIzMFowJjERMA8GA1UEChMIUXVpY2tUTFMxETAPBgNV +BAMTCFF1aWNrVExTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu/Pf +fQ7VUTSXs12PRyrLDVDz7kPDbGNTt0vF7FYDmTTGOU3i62xZNOGuxBezAiVSV5A3 +lopwsv4OH7DRtSaPn+XCt1JDALna2WrjT0MshypMd5o2c3jmGUfAKf5gjizgIoEl +d4e5aqEBuOQP+QCEde+8p8N1buQW+zMy9srM2O/7BFMIaQ07CWLlj3hIiF+L5rKD +L6dWtKT7INRmRwpuZZnThEWnBSNgayrWek6G0i3y8QYTfVA1SwA+H3grJxy5NrLp +GYXSmu2509mu0QAHhx05t1rJhwhFz/4sG7j8AggYeDXEqfQ/VIb/bvnW9bD+vrQ2 +ZnICvxnzNMYBx23BkQIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAKQwDwYDVR0TAQH/ +BAUwAwEB/zALBgkqhkiG9w0BAQsDggEBALvTi6E44Fltu83dFLVEj0kLtusI/TTH +Tw6upoB5pRG+7A75w0Ii8bvvd2tNpBOg+L+80xyIFqaNkXhLKTN4lgtd7WiCuyb/ +w1BEuF/+RjCXhu6wQ/63ab46d6ctaQ1zjxlU2rQLQXQFALI8ntyn/TELc01HYkr2 +x3NHlbnBNlgI2CKXPeUBzvBylTCcdYGwoa+2ZPdIsFjle2aCIBoZ+WNZlIbFwgLh +XCHwcbviC+thjqOneJpJZmRW9AxQ638ki6iGItdrJewCN/1dcL2KKjxnC5VHbpne +SOjEPNXihY08Brl8myhFNtRRKZ55MJIYzDtVQSkCaT91Q3XX9tSZadY= +-----END CERTIFICATE-----