Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated k8s resources apiversion to latest supported k8s 1.17 version #17

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
11 changes: 5 additions & 6 deletions helm/cicdhub/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
name: cicdhub
version: 2.0.6
apiVersion: v1
description: Deployment of LM CICDHub
maintainers:
- name: Accanto Systems
email: [email protected]
icon: http://www.accantosystems.com/wp-content/uploads/2017/06/Accanto-w_white-systems200px.png
keywords:
- Stratoss
Expand All @@ -14,4 +9,8 @@ keywords:
- Accanto
- CICDHub
- CICD Hub
engine: gotpl
maintainers:
- email: [email protected]
name: Accanto Systems
name: cicdhub
version: 2.0.6
21 changes: 21 additions & 0 deletions helm/cicdhub/requirements.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
dependencies:
- name: sonatype-nexus
repository: https://kubernetes-charts.storage.googleapis.com
version: 1.16.0
- name: jenkins
repository: https://kubernetes-charts.storage.googleapis.com
version: 1.3.2
- name: docker-registry
repository: https://kubernetes-charts.storage.googleapis.com
version: 1.7.0
- name: gogs
repository: https://kubernetes-charts-incubator.storage.googleapis.com/
version: 0.7.6
- name: nginx-ingress
repository: https://kubernetes-charts.storage.googleapis.com
version: 0.29.2
- name: openldap
repository: https://kubernetes-charts.storage.googleapis.com
version: 0.2.3
digest: sha256:111d166dd597c97b105d3a3ba5f75b44f8fa72e12edff3a692faaff9d71482fe
generated: 2019-10-30T15:00:52.097453633Z
33 changes: 17 additions & 16 deletions helm/cicdhub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ nexus:
enabled: true
## Customise the storage class. Leave undefined to use the default on the kubernetes cluster
## Use storageClass: nexus-storage if using local volumes created by volumesInit
#storageClass:
storageClass: managed-nfs-storage
storageSize: 100Gi
ingress:
enabled: false
Expand All @@ -49,7 +49,7 @@ gogs:
serviceEnableCaptcha: false
repositoryUploadMaxFileSize: 10000
ingress:
enabled: true
enabled: false
hosts:
- git.cicdhub
annotations:
Expand All @@ -59,7 +59,7 @@ gogs:
enabled: true
## Customise the storage class. Leave undefined to use the default on the kubernetes cluster
## Use storageClass: gogs-storage if using local volumes created by volumesInit
#storageClass:
storageClass: managed-nfs-storage
size: 1Gi
postgresql:
enabled: true
Expand All @@ -70,19 +70,19 @@ gogs:
enabled: true
## Customise the storage class. Leave undefined to use the default on the kubernetes cluster
## Use storageClass: postgresql-storage if using local volumes created by volumesInit
#storageClass:
storageClass: managed-nfs-storage
accessModes:
- ReadWriteOnce
size: 5Gi

jenkins:
enabled: true
master:
imageTag: 2.182
imageTag: 2.243
serviceType: NodePort
nodePort: 32732
ingress:
enabled: true
enabled: false
hostName: jenkins.cicdhub
adminUser: admin
adminPassword: admin
Expand Down Expand Up @@ -114,7 +114,8 @@ jenkins:
- jsch:0.1.55.1
- junit:1.28
- kubernetes:1.16.0
- kubernetes-credentials:0.4.1
- kubernetes-credentials:0.7.0
- kubernetes-client:4.9.2-1
- lockable-resources:2.6
- mailer:1.29
- matrix-project:1.14
Expand Down Expand Up @@ -153,22 +154,22 @@ jenkins:
enabled: true
## Customise the storage class. Leave undefined to use the default on the kubernetes cluster
## Use storageClass: jenkins-storage if using local volumes created by volumesInit
#storageClass:
size: 1Gi
storageClass: managed-nfs-storage
size: 2Gi

## Openldap is an optional dependency for LM. An LDAP server is required when security is enabled, for user management.
## Openldap is the out-of-the-box recommendation.
## Full documentation for the values allowed in this section can be found at: https://github.com/helm/charts/tree/master/stable/openldap
## Note: remember to locate the version of the Openldap helm chart in use by viewing the requirements.yaml file of helm-foundation
openldap:
enabled: true
enabled: false
replicaCount: 1
persistence:
enabled: true
size: "5Gi"
size: "10Gi"
## Customise the storage class. Leave undefined to use the default on the kubernetes cluster
## Use storageClass: openldap-storage if using local volumes created by volumesInit
#storageClass:
storageClass: managed-nfs-storage
existingSecret: openldap-config
env:
LDAP_ORGANISATION: "lm"
Expand All @@ -187,7 +188,7 @@ openldapInit:

## Installs the nginx-ingress controller to enable access to services
nginx-ingress:
enabled: true
enabled: false
controller:
service:
type: NodePort
Expand All @@ -196,15 +197,15 @@ nginx-ingress:
https: 32443

dockerregistry:
enabled: true
enabled: false
replicaCount: 1
persistence:
enabled: true
deleteEnabled: true
size: 100Gi
size: 150Gi
## Customise the storage class. Leave undefined to use the default on the kubernetes cluster
## Use storageClass: docker-registry-storage if using local volumes created by volumesInit
#storageClass:
storageClass: managed-nfs-storage
service:
type: NodePort
nodePort: 32736