summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwutianwei <wutianwei1@huawei.com>2018-11-28 19:12:02 -0800
committerwutianwei <wutianwei1@huawei.com>2018-12-13 01:47:15 +0000
commitfbc39f64e0f7c09558a5ce421719b63217c77d7b (patch)
treea2fe78e125ff58832f5699a6ed3e2c284057e5c8
parentb0231105e304d21f454bec58c4c2905f8d8b8e5f (diff)
Upgrade spinnaker to suppport helm deployopnfv-7.2.0opnfv-7.1.0stable/gambia
JIRA: CLOVER-99 1. Upgrade the spinnaker to 1.10.5 from 1.7.0 2. Enable the artifact featuer and add s3 artifact 3. Add the user guide to deploy helm charts. Change-Id: Ic44a88525cc609f3a24d3873b796f064436a57bf Signed-off-by: wutianwei <wutianwei1@huawei.com>
-rw-r--r--clover/spinnaker/install/quick-install-spinnaker.yml16
-rw-r--r--docs/release/configguide/imgs/spinnaker-bake.pngbin0 -> 61742 bytes
-rw-r--r--docs/release/configguide/imgs/spinnaker-deploy.pngbin0 -> 62381 bytes
-rw-r--r--docs/release/configguide/imgs/spinnaker-expected-artifacts.pngbin0 -> 37564 bytes
-rw-r--r--docs/release/configguide/imgs/spinnaker-produces-artifact.pngbin0 -> 17589 bytes
-rw-r--r--docs/release/configguide/spinnaker_config_guide.rst63
6 files changed, 78 insertions, 1 deletions
diff --git a/clover/spinnaker/install/quick-install-spinnaker.yml b/clover/spinnaker/install/quick-install-spinnaker.yml
index 31a2b27..2b19037 100644
--- a/clover/spinnaker/install/quick-install-spinnaker.yml
+++ b/clover/spinnaker/install/quick-install-spinnaker.yml
@@ -69,6 +69,9 @@ spec:
mountPath: /home/spinnaker/staging/.hal/default/service-settings/fiat.yml
subPath: fiat.yml
- name: halconfig
+ mountPath: /home/spinnaker/staging/.hal/default/service-settings/clouddriver.yml
+ subPath: clouddriver.yml
+ - name: halconfig
mountPath: /home/spinnaker/staging/.hal/default/profiles/front50-local.yml
subPath: front50-local.yml
volumes:
@@ -112,11 +115,15 @@ data:
host: 0.0.0.0
env:
API_HOST: http://spin-gate.spinnaker:8084/
+ clouddriver.yml: |
+ env:
+ AWS_ACCESS_KEY_ID: dont-use-this
+ AWS_SECRET_ACCESS_KEY: for-production
config: |
currentDeployment: default
deploymentConfigurations:
- name: default
- version: 1.7.0
+ version: 1.10.5
providers:
appengine:
enabled: false
@@ -211,6 +218,7 @@ data:
chaos: false
entityTags: false
jobs: false
+ artifacts: true
metricStores:
datadog:
enabled: false
@@ -273,6 +281,12 @@ data:
http:
enabled: false
accounts: []
+ s3:
+ enabled: true
+ accounts:
+ - name: s3-account
+ apiEndpoint: http://minio-service.spinnaker:9000
+ apiRegion: clover
pubsub:
google:
enabled: false
diff --git a/docs/release/configguide/imgs/spinnaker-bake.png b/docs/release/configguide/imgs/spinnaker-bake.png
new file mode 100644
index 0000000..86e853a
--- /dev/null
+++ b/docs/release/configguide/imgs/spinnaker-bake.png
Binary files differ
diff --git a/docs/release/configguide/imgs/spinnaker-deploy.png b/docs/release/configguide/imgs/spinnaker-deploy.png
new file mode 100644
index 0000000..44b4e92
--- /dev/null
+++ b/docs/release/configguide/imgs/spinnaker-deploy.png
Binary files differ
diff --git a/docs/release/configguide/imgs/spinnaker-expected-artifacts.png b/docs/release/configguide/imgs/spinnaker-expected-artifacts.png
new file mode 100644
index 0000000..f8204f7
--- /dev/null
+++ b/docs/release/configguide/imgs/spinnaker-expected-artifacts.png
Binary files differ
diff --git a/docs/release/configguide/imgs/spinnaker-produces-artifact.png b/docs/release/configguide/imgs/spinnaker-produces-artifact.png
new file mode 100644
index 0000000..ba6ab65
--- /dev/null
+++ b/docs/release/configguide/imgs/spinnaker-produces-artifact.png
Binary files differ
diff --git a/docs/release/configguide/spinnaker_config_guide.rst b/docs/release/configguide/spinnaker_config_guide.rst
index 433ca3d..a1508f2 100644
--- a/docs/release/configguide/spinnaker_config_guide.rst
+++ b/docs/release/configguide/spinnaker_config_guide.rst
@@ -238,3 +238,66 @@ Deleting the kubernetes provider in spinnaker:
.. code-block:: bash
$ cloverctl delete provider kubernetes -n my-kubernetes
+
+Deploy Helm Charts
+==================
+
+Currently, spinnaker support to deploy applications with the helm chart. More information please refer to `Deploy Helm Charts <https://www.spinnaker.io/guides/user/kubernetes-v2/deploy-helm/>`_.
+
+Upload helm charts to artifacts
+-------------------------------
+
+Before doing this, please package the helm chart first. how to package the chart, refer to `helm documentation <https://docs.helm.sh/helm/#helm_package>`_.
+
+.. code-block:: bash
+
+ $ wget https://dl.minio.io/client/mc/release/linux-amd64/mc
+ $ chmod +x mc
+ $ ./mc config host add my_minio http://{minio-service-ip}:9000 dont-use-this for-production S3v4
+ $ ./mc mb my_minio/s3-account
+ $ ./mc cp test-0.1.0.tgz my_minio/s3-account/test-0.1.0.tgz
+
+**NOTE:** the minio-service-ip is 10.233.21.175 in this example
+
+Configure Pipeline
+------------------
+
+This pipeline include three stages,configuration, bake and deploy.
+
+Configuration stage
+:::::::::::::::::::
+
+We can configure Automated triggers and expected artifacts in this stage.
+We just declare expected artifacts and trigger the pipeline manually.
+
+.. image:: imgs/spinnaker-expected-artifacts.png
+ :align: center
+ :scale: 100%
+
+**NOTE:** We need to enable "Use Default Artifact", when we need trigger the pipeline manually
+
+Bake Manifest stage
+:::::::::::::::::::
+
+For example, we have a test "Bake(Manifest)" stage below
+
+.. image:: imgs/spinnaker-bake.png
+ :align: center
+ :scale: 100%
+
+Spinnaker has automatically created an embedded/base64 artifact that is bound when the stage completes, representing the fully baked manifest set to be deployed downstream.
+
+.. image:: imgs/spinnaker-produces-artifact.png
+ :align: center
+ :scale: 100%
+
+Deploy Manifest stage
+:::::::::::::::::::::
+
+After the chart was baked by helm, we can configure a "Deploy(Manifest)" stage to deploy the manifest produced by previous stage as shown below.
+
+.. image:: imgs/spinnaker-deploy.png
+ :align: center
+ :scale: 100%
+
+Once this pipeline runs completely, you can see every resource in your Helm chart get deployed.