Code Review
/
ta
/
caas-helm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update Helm to version 2.15.0
[ta/caas-helm.git]
/
ansible
/
roles
/
chart_repo
/
templates
/
chart-repo.yml
diff --git
a/ansible/roles/chart_repo/templates/chart-repo.yml
b/ansible/roles/chart_repo/templates/chart-repo.yml
index
aacf6b7
..
9a111a7
100644
(file)
--- a/
ansible/roles/chart_repo/templates/chart-repo.yml
+++ b/
ansible/roles/chart_repo/templates/chart-repo.yml
@@
-14,7
+14,7
@@
See the License for the specific language governing permissions and
limitations under the License.
#}
---
limitations under the License.
#}
---
-apiVersion: apps/v1
beta2
+apiVersion: apps/v1
kind: Deployment
metadata:
name: chart-repo
kind: Deployment
metadata:
name: chart-repo
@@
-26,20
+26,13
@@
spec:
{{ caas.kubernetes_component_label }}: chart-repo
template:
metadata:
{{ caas.kubernetes_component_label }}: chart-repo
template:
metadata:
- annotations:
- danm.k8s.io/interfaces: |
- [
- {
- "network":"flannel"
- }
- ]
labels:
{{ caas.kubernetes_component_label }}: chart-repo
spec:
priorityClassName: "system-cluster-critical"
dnsPolicy: ClusterFirst
nodeSelector:
labels:
{{ caas.kubernetes_component_label }}: chart-repo
spec:
priorityClassName: "system-cluster-critical"
dnsPolicy: ClusterFirst
nodeSelector:
- node
name: caas_master1
+ node
type: caas_master
securityContext:
runAsUser: {{ caas.uid.chartrepo }}
containers:
securityContext:
runAsUser: {{ caas.uid.chartrepo }}
containers:
@@
-62,7
+55,7
@@
spec:
- name: CHARTREPOHANDLER_LISTENONINTERFACE
value: "{{ caas.internal_flannel_interface }}"
- name: CHARTREPOHANDLER_AUTHKEY
- name: CHARTREPOHANDLER_LISTENONINTERFACE
value: "{{ caas.internal_flannel_interface }}"
- name: CHARTREPOHANDLER_AUTHKEY
- value: "{{
swift_pass.stdout
}}"
+ value: "{{
caas.swift_credential.password
}}"
- name: CHARTREPOHANDLER_CONTAINER
value: packages
- name: CHARTREPOHANDLER_REPOURL
- name: CHARTREPOHANDLER_CONTAINER
value: packages
- name: CHARTREPOHANDLER_REPOURL
@@
-70,9
+63,9
@@
spec:
- name: CHARTREPOHANDLER_INDEXPATH
value: charts
- name: CHARTREPOHANDLER_TLSCERTPATH
- name: CHARTREPOHANDLER_INDEXPATH
value: charts
- name: CHARTREPOHANDLER_TLSCERTPATH
- value: /etc/chart-repo/ssl/chart-repo
{{ nodeindex }}
.pem
+ value: /etc/chart-repo/ssl/chart-repo.pem
- name: CHARTREPOHANDLER_TLSKEYPATH
- name: CHARTREPOHANDLER_TLSKEYPATH
- value: /etc/chart-repo/ssl/chart-repo
{{ nodeindex }}
-key.pem
+ value: /etc/chart-repo/ssl/chart-repo-key.pem
- name: CHARTREPOHANDLER_TLSCAPATH
value: /etc/chart-repo/ssl/ca.pem
volumeMounts:
- name: CHARTREPOHANDLER_TLSCAPATH
value: /etc/chart-repo/ssl/ca.pem
volumeMounts: