Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kubernetes/pods/spinnaker-helm/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
HELM_BINARY?=helm
KUBE_CONFIG_FILE?=~/.kube/config
KUBECONFIG?=~/.kube/config
KUBE_NAMESPACE?=spinnaker

BASE_PATH=.

APPLCATION_CHART_NAME=stable/spinnaker
APPLICATION_NAME=spinnaker
APPLICATION_VERSION=0.6.0
APPLICATION_VERSION=1.1.3

VALUES_FILE?=values.yaml

Expand Down
2 changes: 1 addition & 1 deletion kubernetes/pods/spinnaker-helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export KUBE_NAMESPACE=spinnaker
helm repo add stable https://kubernetes-charts.storage.googleapis.com/

helm install \
--version 0.6.0 \
--version 1.1.3 \
--name ${KUBE_NAMESPACE}-spinnaker \
--namespace ${KUBE_NAMESPACE} \
--values ./values.yaml \
Expand Down
159 changes: 77 additions & 82 deletions kubernetes/pods/spinnaker-helm/values.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
halyard:
spinnakerVersion: 1.9.1
image:
repository: gcr.io/spinnaker-marketplace/halyard
tag: 1.9.1
# Provide a config map with Hal commands that will be run the core config (storage)
# The config map should contain a script in the config.sh key
additionalConfig:
enabled: false
configMapName: my-halyard-config
configMapKey: config.sh

# Define which registries and repositories you want available in your
# Spinnaker pipeline definitions
# For more info visit:
# https://www.spinnaker.io/setup/providers/docker-registry/

# Configure your Docker registries here
accounts:
dockerRegistries:
- name: dockerhub
address: https://index.docker.io
address: index.docker.io
repositories:
- library/alpine
- library/ubuntu
Expand All @@ -18,9 +30,13 @@ accounts:
# password: '<INSERT YOUR SERVICE ACCOUNT JSON HERE>'
# email: [email protected]

# Settings for notifications via email
# For more info visit:
# https://www.spinnaker.io/setup/features/notifications/#email
# If you don't want to put your passwords into a values file
# you can use a pre-created secret instead of putting passwords
# (specify secret name in below `dockerRegistryAccountSecret`)
# per account above with data in the format:
# <name>: <password>

# dockerRegistryAccountSecret: myregistry-secrets

kubeConfig:
# Use this when you want to register arbitrary clusters with Spinnaker
Expand All @@ -29,66 +45,31 @@ kubeConfig:
secretName: my-kubeconfig
secretKey: config
# List of contexts from the kubeconfig to make available to Spinnaker
contexts: []

mail:
enabled: false
host: smtp.example.org
username: admin
password: admin
fromAddress: [email protected]
port: 25

slack:
enabled: false
token:
botName: 'spinnakerbot'

# Images for each component
images:
clouddriver: gcr.io/spinnaker-marketplace/clouddriver:2.0.0-20180221152902
echo: gcr.io/spinnaker-marketplace/echo:0.8.0-20180221133510
deck: gcr.io/spinnaker-marketplace/deck:2.1.0-20180221143146
igor: gcr.io/spinnaker-marketplace/igor:0.9.0-20180221133510
orca: gcr.io/spinnaker-marketplace/orca:0.10.0-20180221133510
gate: gcr.io/spinnaker-marketplace/gate:0.10.0-20180221133510
front50: gcr.io/spinnaker-marketplace/front50:0.9.0-20180221133510
rosco: gcr.io/spinnaker-marketplace/rosco:0.5.0-20180221133510
contexts:
- default
deploymentContext: default

# Change this if youd like to expose Spinnaker outside the cluster
deck:
host: localhost
port: 9000
protocol: http
ingress:
enabled: false
# annotations:
# ingress.kubernetes.io/ssl-redirect: 'true'
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
# tls:
# - secretName: -tls
# hosts:
# - domain.com

gate:
allowedOriginsPattern: '^https?://(?:localhost|127.0.0.1|[^/]+\.example\.com)(?::[1-9]\d*)?/?$'

# Bucket to use when storing config data in S3 compatible storage
storageBucket: spinnaker

# Change service type for UI service
serviceType: ClusterIP

# Resources to provide to each of
# the Spinnaker components
resources:
limits:
cpu: 1000m
memory: 1280Mi
requests:
cpu: 1000m
memory: 1280Mi
ingress:
enabled: false
# host: spinnaker.example.org
# annotations:
# ingress.kubernetes.io/ssl-redirect: 'true'
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
# tls:
# - secretName: -tls
# hosts:
# - domain.com

# spinnakerFeatureFlags is a list of Spinnaker feature flags to enable
# Ref: https://www.spinnaker.io/reference/halyard/commands/#hal-config-features-edit
# spinnakerFeatureFlags:
# - artifacts
# - pipeline-templates
spinnakerFeatureFlags:
- artifacts
- jobs

# Node labels for pod assignment
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
Expand All @@ -98,38 +79,52 @@ nodeSelector: {}
# Redis password to use for the in-cluster redis service
# Redis is not exposed publically
redis:
redisPassword: password
password: password
nodeSelector: {}
cluster:
enabled: false
# Uncomment if you don't want to create a PVC for redis
# master:
# persistence:
# enabled: false

# Minio access/secret keys for the in-cluster S3 usage
# Minio is not exposed publically
minio:
enabled: true
imageTag: RELEASE.2016-11-26T02-23-47Z
imageTag: RELEASE.2018-06-09T02-18-09Z
serviceType: ClusterIP
accessKey: spinnakeradmin
secretKey: spinnakeradmin
bucket: "spinnaker"
nodeSelector: {}
# Uncomment if you don't want to create a PVC for minio
# persistence:
# enabled: false

gcs:
enabled: false
project: my-project-name
bucket: "<GCS-BUCKET-NAME>"
jsonKey: '<INSERT CLOUD STORAGE JSON HERE>'

# Configuration for the Jenkins instance that is attached to the
# igor component of Spinnaker. For more info about the Jenkins integration
# with Spinnaker, visit:
# https://www.spinnaker.io/setup/ci/jenkins/
jenkins:
enabled: true
Master:
Cpu: "500m"
Memory: "512Mi"
ServiceType: ClusterIP
CustomConfigMap: true
NodeSelector: {}

Agent:
Cpu: "500m"
Memory: "512Mi"
NodeSelector: {}
s3:
enabled: false
bucket: "<S3-BUCKET-NAME>"
# rootFolder: "front50"
# region: "us-east-1"
# endpoint: ""
# accessKey: ""
# secretKey: ""

rbac:
# Specifies whether RBAC resources should be created
create: true

serviceAccount:
# Specifies whether a ServiceAccount should be created
create: true
# The name of the ServiceAccounts to use.
# If left blank it is auto-generated from the fullname of the release
halyardName:
spinnakerName: