Merge pull request #662 from mattmoyer/parameterize-test-images
Parameterize our test images in ytt.
This commit is contained in:
commit
9b9e733a7d
@ -1,5 +1,8 @@
|
|||||||
#! Copyright 2020-2021 the Pinniped contributors. All Rights Reserved.
|
#! Copyright 2020-2021 the Pinniped contributors. All Rights Reserved.
|
||||||
#! SPDX-License-Identifier: Apache-2.0
|
#! SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
|
#@ load("@ytt:data", "data")
|
||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
@ -50,8 +53,7 @@ spec:
|
|||||||
serviceAccountName: cert-issuer
|
serviceAccountName: cert-issuer
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: generate-certs
|
- name: generate-certs
|
||||||
image: cfssl/cfssl:1.5.0
|
image: #@ data.values.cfssl_image
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
command: ["/bin/bash"]
|
command: ["/bin/bash"]
|
||||||
args:
|
args:
|
||||||
- -c
|
- -c
|
||||||
@ -108,7 +110,7 @@ spec:
|
|||||||
mountPath: /var/certs
|
mountPath: /var/certs
|
||||||
containers:
|
containers:
|
||||||
- name: save-certs
|
- name: save-certs
|
||||||
image: bitnami/kubectl
|
image: #@ data.values.kubectl_image
|
||||||
command: ["/bin/bash"]
|
command: ["/bin/bash"]
|
||||||
args:
|
args:
|
||||||
- -c
|
- -c
|
||||||
|
@ -68,8 +68,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: dex
|
- name: dex
|
||||||
image: ghcr.io/dexidp/dex:v2.27.0
|
image: #@ data.values.dex_image
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
command:
|
command:
|
||||||
- /usr/local/bin/dex
|
- /usr/local/bin/dex
|
||||||
- serve
|
- serve
|
||||||
|
@ -209,8 +209,7 @@ spec:
|
|||||||
#! Use our own fork of docker.io/bitnami/openldap for now, because we added the
|
#! Use our own fork of docker.io/bitnami/openldap for now, because we added the
|
||||||
#! LDAP_SERVER_CONFIG_BEFORE_CUSTOM_LDIF_DIR and LDAP_SERVER_CONFIG_AFTER_CUSTOM_LDIF_DIR options.
|
#! LDAP_SERVER_CONFIG_BEFORE_CUSTOM_LDIF_DIR and LDAP_SERVER_CONFIG_AFTER_CUSTOM_LDIF_DIR options.
|
||||||
#! See https://github.com/pinniped-ci-bot/bitnami-docker-openldap/tree/pinniped
|
#! See https://github.com/pinniped-ci-bot/bitnami-docker-openldap/tree/pinniped
|
||||||
image: projects.registry.vmware.com/pinniped/test-ldap:latest
|
image: #@ data.values.ldap_image
|
||||||
imagePullPolicy: Always
|
|
||||||
ports:
|
ports:
|
||||||
- name: ldap
|
- name: ldap
|
||||||
containerPort: 1389
|
containerPort: 1389
|
||||||
|
@ -25,8 +25,7 @@ spec:
|
|||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
containers:
|
containers:
|
||||||
- name: proxy
|
- name: proxy
|
||||||
image: projects.registry.vmware.com/pinniped/test-forward-proxy
|
image: #@ data.values.proxy_image
|
||||||
imagePullPolicy: Always
|
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
containerPort: 3128
|
containerPort: 3128
|
||||||
@ -48,7 +47,7 @@ spec:
|
|||||||
periodSeconds: 5
|
periodSeconds: 5
|
||||||
failureThreshold: 2
|
failureThreshold: 2
|
||||||
- name: accesslogs
|
- name: accesslogs
|
||||||
image: debian:10.8-slim
|
image: #@ data.values.proxy_image
|
||||||
command:
|
command:
|
||||||
- "/bin/sh"
|
- "/bin/sh"
|
||||||
- "-c"
|
- "-c"
|
||||||
|
@ -25,3 +25,10 @@ pinny_bcrypt_passwd_hash:
|
|||||||
|
|
||||||
#! The plaintext password of the LDAP test account user.
|
#! The plaintext password of the LDAP test account user.
|
||||||
pinny_ldap_password:
|
pinny_ldap_password:
|
||||||
|
|
||||||
|
#! Images for each of the deployed test components.
|
||||||
|
dex_image: ghcr.io/dexidp/dex:v2.27.0
|
||||||
|
ldap_image: projects.registry.vmware.com/pinniped/test-ldap:latest
|
||||||
|
proxy_image: projects.registry.vmware.com/pinniped/test-forward-proxy:latest
|
||||||
|
cfssl_image: cfssl/cfssl:1.5.0
|
||||||
|
kubectl_image: bitnami/kubectl:latest
|
||||||
|
Loading…
Reference in New Issue
Block a user