FASJSON: we don't need the host keytab
Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
parent
a0975faca8
commit
86a521ef42
3 changed files with 0 additions and 14 deletions
|
@ -52,12 +52,6 @@
|
||||||
# The ipa-ldap delegation target is declared during IPA installation
|
# The ipa-ldap delegation target is declared during IPA installation
|
||||||
|
|
||||||
# Keytabs
|
# Keytabs
|
||||||
- role: openshift/keytab
|
|
||||||
app: fasjson
|
|
||||||
key: host
|
|
||||||
secret_name: fasjson-keytab-host
|
|
||||||
service: host
|
|
||||||
host: "fasjson{{ env_suffix }}.fedoraproject.org"
|
|
||||||
- role: openshift/keytab
|
- role: openshift/keytab
|
||||||
app: fasjson
|
app: fasjson
|
||||||
key: http
|
key: http
|
||||||
|
|
|
@ -37,7 +37,6 @@ RUN git clone https://github.com/fedora-infra/fasjson.git && \
|
||||||
popd && \
|
popd && \
|
||||||
rm -rf fasjson
|
rm -rf fasjson
|
||||||
RUN rm -f /etc/krb5.conf && ln -sf /etc/krb5/krb5.conf /etc/krb5.conf && \
|
RUN rm -f /etc/krb5.conf && ln -sf /etc/krb5/krb5.conf /etc/krb5.conf && \
|
||||||
ln -sf /etc/keytabs/host /etc/krb5.keytab && \
|
|
||||||
rm -f /etc/openldap/ldap.conf && ln -sf /etc/ipa/ldap.conf /etc/openldap/ldap.conf
|
rm -f /etc/openldap/ldap.conf && ln -sf /etc/ipa/ldap.conf /etc/openldap/ldap.conf
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
ENTRYPOINT bash /etc/fasjson/start.sh
|
ENTRYPOINT bash /etc/fasjson/start.sh
|
||||||
|
|
|
@ -31,10 +31,6 @@ spec:
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8080
|
- containerPort: 8080
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: keytab-host-volume
|
|
||||||
mountPath: /etc/keytabs/host
|
|
||||||
subPath: host
|
|
||||||
readOnly: true
|
|
||||||
- name: keytab-http-volume
|
- name: keytab-http-volume
|
||||||
mountPath: /etc/keytabs/http
|
mountPath: /etc/keytabs/http
|
||||||
subPath: http
|
subPath: http
|
||||||
|
@ -68,9 +64,6 @@ spec:
|
||||||
- name: fasjson-config-volume
|
- name: fasjson-config-volume
|
||||||
configMap:
|
configMap:
|
||||||
name: fasjson-config
|
name: fasjson-config
|
||||||
- name: keytab-host-volume
|
|
||||||
secret:
|
|
||||||
secretName: fasjson-keytab-host
|
|
||||||
- name: keytab-http-volume
|
- name: keytab-http-volume
|
||||||
secret:
|
secret:
|
||||||
secretName: fasjson-keytab-http
|
secretName: fasjson-keytab-http
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue