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.

Sign up for GitHub

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

🦅 Bump Chart and add secrets 🦅 #34

Merged
merged 2 commits into from
Apr 28, 2020
Merged

🦅 Bump Chart and add secrets 🦅 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d3ec36
🦅 Bump Chart and add secrets 🦅
springdo Apr 28, 2020
66f2eb9
🦅 Bump Chart and add secrets 🦅
springdo Apr 28, 2020
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
8 changes: 4 additions & 4 deletions charts/jenkins/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
appVersion: "v0.0.1"
description: A Helm chart for deploying Jenkins on OpenShift
apiVersion: v2
appVersion: "v2.204.1"
description: A Helm chart for deploying Jenkins on OpenShift with some additional build agents and plugins
name: jenkins
version: 0.0.9
version: 0.0.10
home: https://github.com/rht-labs/helm-charts
maintainers:
- name: springdo
Expand Down
14 changes: 9 additions & 5 deletions charts/jenkins/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{{- if .Values.source_secret }}
{{- range $key := .Values.source_secrets }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ .Values.source_secret.name }}
name: {{ .name }}
labels:
credential.sync.jenkins.openshift.io: "true"
type: kubernetes.io/basic-auth
type: {{ .type | default "kubernetes.io/basic-auth" | quote }}
stringData:
password: {{ .Values.source_secret.password | quote }}
username: {{ .Values.source_secret.username | quote }}
{{- if .token }}
token: {{ .token | quote }}
{{- else }}
password: {{ .password | quote }}
username: {{ .username | quote }}
{{- end }}
{{- end }}
46 changes: 28 additions & 18 deletions charts/jenkins/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,20 @@ route: true

# ovs this is not a real password in use.... or is it?
# ¯\_(ツ)_/¯
source_secret:
name: git-auth
username: idm-sa
password: thisisdefinitelymypassword
source_secrets:
# secret used to git clone inside of OpenShift when running s2i and possibly in a Jenkins job too
- name: git-auth
username: idm-sa
password: thisisdefinitelymypassword
# some token... appears in jenkins env as JSON ie {"token": "aaaaa.bbbbb.ccccc"}
- name: my-token
type: Opaque
token: aaaaa.bbbbb.ccccc
# default password for nexus bind for jenkis - this is ovs changed.
# .... probably
- name: nexus-password
username: admin
password: admin123

deployment:
openshiftauth: true
Expand Down Expand Up @@ -107,83 +117,83 @@ buildconfigs:
strategy_type: "Docker"
source_context_dir: "jenkins-slaves/jenkins-slave-mvn"
source_repo: "https://github.com/redhat-cop/containers-quickstarts"
source_repo_ref: "v1.20"
source_repo_ref: "v1.22"
builder_image_name: "quay.io/openshift/origin-jenkins-agent-maven"
builder_image_tag: "4.2"
- name: "jenkins-slave-helm"
strategy_type: "Docker"
source_context_dir: "jenkins-slaves/jenkins-slave-helm"
source_repo: "https://github.com/redhat-cop/containers-quickstarts"
source_repo_ref: "v1.20"
source_repo_ref: "v1.22"
builder_image_name: "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
builder_image_tag: "latest"
- name: "jenkins-slave-argocd"
strategy_type: "Docker"
source_context_dir: "jenkins-slaves/jenkins-slave-argocd"
source_repo: "https://github.com/redhat-cop/containers-quickstarts"
source_repo_ref: "v1.20"
source_repo_ref: "v1.22"
builder_image_name: "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
builder_image_tag: "latest"
- name: "jenkins-slave-arachni"
strategy_type: "Docker"
source_context_dir: "jenkins-slaves/jenkins-slave-arachni"
source_repo: "https://github.com/redhat-cop/containers-quickstarts"
source_repo_ref: "v1.20"
source_repo_ref: "v1.22"
builder_image_name: "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
builder_image_tag: "latest"
- name: "jenkins-slave-golang"
strategy_type: "Docker"
source_context_dir: "jenkins-slaves/jenkins-slave-golang"
source_repo: "https://github.com/redhat-cop/containers-quickstarts"
source_repo_ref: "v1.20"
source_repo_ref: "v1.22"
builder_image_name: "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
builder_image_tag: "latest"
- name: "jenkins-slave-gradle"
strategy_type: "Docker"
source_context_dir: "jenkins-slaves/jenkins-slave-gradle"
source_repo: "https://github.com/redhat-cop/containers-quickstarts"
source_repo_ref: "v1.20"
source_repo_ref: "v1.22"
builder_image_name: "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
builder_image_tag: "latest"
- name: "jenkins-slave-image-mgmt"
strategy_type: "Docker"
source_context_dir: "jenkins-slaves/jenkins-slave-image-mgmt"
source_repo: "https://github.com/redhat-cop/containers-quickstarts"
source_repo_ref: "v1.20"
source_repo_ref: "v1.22"
builder_image_name: "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
builder_image_tag: "latest"
- name: "jenkins-slave-mongodb"
strategy_type: "Docker"
source_context_dir: "jenkins-slaves/jenkins-slave-mongodb"
source_repo: "https://github.com/redhat-cop/containers-quickstarts"
source_repo_ref: "v1.20"
source_repo_ref: "v1.22"
builder_image_name: "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
builder_image_tag: "latest"
- name: "jenkins-slave-npm"
strategy_type: "Docker"
source_context_dir: "jenkins-slaves/jenkins-slave-npm"
source_repo: "https://github.com/redhat-cop/containers-quickstarts"
source_repo_ref: "v1.20"
builder_image_name: "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
source_repo_ref: "v1.22"
builder_image_name: "openshift/jenkins-slave-base-centos7:v3.11"
builder_image_tag: "latest"
- name: "jenkins-slave-python"
strategy_type: "Docker"
source_context_dir: "jenkins-slaves/jenkins-slave-python"
source_repo: "https://github.com/redhat-cop/containers-quickstarts"
source_repo_ref: "v1.20"
source_repo_ref: "v1.22"
builder_image_name: "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
builder_image_tag: "latest"
- name: "jenkins-slave-ruby"
strategy_type: "Docker"
source_context_dir: "jenkins-slaves/jenkins-slave-ruby"
source_repo: "https://github.com/redhat-cop/containers-quickstarts"
source_repo_ref: "v1.20"
source_repo_ref: "v1.22"
builder_image_name: "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
builder_image_tag: "latest"
- name: "jenkins-slave-ansible"
strategy_type: "Docker"
source_context_dir: "jenkins-slaves/jenkins-slave-ansible"
source_repo: "https://github.com/redhat-cop/containers-quickstarts"
source_repo_ref: "v1.20"
source_repo_ref: "v1.22"
builder_image_name: "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
builder_image_tag: "latest"
builder_image_tag: "latest"