Commit f1e572b8 authored by David Yu Yuan's avatar David Yu Yuan
Browse files

Merge branch 'latest' into 'master'

Latest to master

See merge request !104
parents 0f2bba32 72e4726a
......@@ -27,7 +27,7 @@ before_script:
- pip install virtualenv
- virtualenv venv
- source venv/bin/activate
- git clone https://${GITLAB_USER_LOGIN}:${GITLAB_USER_ACCESS_TOKEN}@gitlab.ebi.ac.uk/davidyuan/vault.git
- git clone https://${GITLAB_USER_LOGIN}:${GITLAB_USER_ACCESS_TOKEN}@gitlab.ebi.ac.uk/cc/cc-vault.git
- find ${CI_PROJECT_DIR} -type f -name '*.sh' | xargs chmod +x
- mkdir -p ${ARTIFACT_DIR}
- PATH=${PATH}:${CI_PROJECT_DIR}:${CI_PROJECT_DIR}/google-cloud-sdk/bin/
......@@ -36,11 +36,11 @@ before_script:
build-ehk:
stage: build
script:
- cp ${CI_PROJECT_DIR}/vault/osk/ehk.yml $KUBECONFIG
- cp ${CI_PROJECT_DIR}/cc-vault/osk/kube.yml $KUBECONFIG
- ${CI_PROJECT_DIR}/install.k8s.sh
- ${CI_PROJECT_DIR}/check.k8s.sh | tee ${ARTIFACT_DIR}/check.k8s.log
- source ${CI_PROJECT_DIR}/vault/s3/minio.prop
- source ${CI_PROJECT_DIR}/vault/db/mysql.prop
- source ${CI_PROJECT_DIR}/cc-vault/s3/minio.prop
- source ${CI_PROJECT_DIR}/cc-vault/db/mysql.prop
- ${CI_PROJECT_DIR}/osk/backend.sh ${mysqlpass} ${accesskey} ${secretkey} | tee ${ARTIFACT_DIR}/backend.log
artifacts:
when: always
......
......@@ -11,9 +11,9 @@ The dates reserved for 2019 are:
+================+=================+=========+==========================================================+=====================+
| 21 Aug 2019 | Garden Room | 30 | `21 Aug Register <http://bit.ly/cc-resops-aug19>`_ | closed |
+----------------+-----------------+---------+----------------------------------------------------------+---------------------+
| 04 Sep 2019 | Training room 1 | 30 | `04 Sep Register <http://bit.ly/cc-resops-190904>`_ | 25 Aug 2019 |
| 04 Sep 2019 | Training room 1 | 30 | `04 Sep Register <http://bit.ly/cc-resops-190904>`_ | closed |
+----------------+-----------------+---------+----------------------------------------------------------+---------------------+
| 13 Sep 2019 | Garden Room | 30 | `13 Sep Register <http://bit.ly/cc-resops-190913>`_ | 03 Sep 2019 |
| 13 Sep 2019 | Garden Room | 30 | `13 Sep Register <http://bit.ly/cc-resops-190913>`_ | closed |
+----------------+-----------------+---------+----------------------------------------------------------+---------------------+
| 02 Oct 2019 | Garden Room | 30 | `02 Oct Register <http://bit.ly/cc-resops-191002>`_ | 22 Sep 2019 |
+----------------+-----------------+---------+----------------------------------------------------------+---------------------+
......@@ -46,7 +46,7 @@ Schedule and links
+----------+----------+--------------------------------------------------------------------------------------------------------------------+
| Time | Duration | Topic |
+==========+==========+====================================================================================================================+
| 09.00 | 15 min | Setting up, signing in, and coffee |
| 09.00 | 15 min | Setting up, signing in. |
+----------+----------+--------------------------------------------------------------------------------------------------------------------+
| 09.15 | 15 min | `Introduction to ResOps, Day schedule <../../_static/pdf/resops2019/Introduction.pdf>`_ |
+----------+----------+--------------------------------------------------------------------------------------------------------------------+
......
......@@ -33,7 +33,19 @@ In particular, we will discuss items 1 - 4 and leave items 5 - 7 as reading afte
Credentials and Floating IP [FIP]
---------------------------------
VAC team provides two ways for you to retrieve configuration of your new Kubernetes cluster: GUI and script. It may be easier to run a script. You will receive a user token, a wrapper token, a kubeconfig path in the vault and a bash script via several email messages. Run the script in a Mac or Linux terminal. It will download the configuration of the new cluster, a `kube.yml` file into the current directory. It is a good idea to rename and to move it to `~/.kube` following general convention. You may find that you have multiple configure files already with the default named `config`. I have moved my `./kube.yml` to `~/.kube/oskconfig`::
VAC team provides two ways for you to retrieve configuration of your new Kubernetes cluster: GUI and script. It may be easier to run a script. You will receive a user token, a wrapper token, a kubeconfig path in the vault and a bash script via several email messages. Run the script in a Mac or Linux terminal. It will download the configuration of the new cluster, a `kube.yml` file into the current directory::
C02XD1G9JGH7:~ davidyuan$ bash <(curl -sSL https://gitlab.ebi.ac.uk/vac/embassy-user-scripts/raw/master/get-kubeconfig )
#---
Embassy Cloud : get-kubeconfig script
#---
Please enter your user token: __DELETED__
Please enter your wrapping token: __DELETED__
Please enter your kubeconfig vault path: __DELETED__
...
* Your kubeconfig file has been created (kube.yml)!!
It is a good idea to rename and to move it to `~/.kube` following general convention. You may find that you have multiple configure files already with the default named `config`. I have moved my `./kube.yml` to `~/.kube/oskconfig`::
C02XD1G9JGH7:tsi-ccdoc davidyuan$ cd ~/.kube
C02XD1G9JGH7:.kube davidyuan$ ls -l
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment