Skip to content

Commit

Permalink
salt: Add deployment files to salt tree
Browse files Browse the repository at this point in the history
This commit adds the dex deployment sls files to the salt-tree
  • Loading branch information
Ebaneck committed Nov 14, 2019
1 parent 13f160a commit 8bc02b2
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 1 deletion.
9 changes: 8 additions & 1 deletion buildchain/buildchain/salt_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,11 @@ def _get_parts(self) -> Iterator[str]:
),

Path('salt/metalk8s/addons/dex/deployed/init.sls'),
Path('salt/metalk8s/addons/dex/deployed/chart.sls'),
Path('salt/metalk8s/addons/dex/deployed/namespace.sls'),
Path('salt/metalk8s/addons/dex/deployed/dex-conf.sls'),
Path('salt/metalk8s/addons/dex/deployed/dex-service.sls'),
Path('salt/metalk8s/addons/dex/deployed/chart.sls'),
Path('salt/metalk8s/addons/dex/deployed/dex-tls-secret.sls'),

Path('salt/metalk8s/addons/prometheus-operator/deployed/chart.sls'),
Path('salt/metalk8s/addons/prometheus-operator/deployed/cleanup.sls'),
Expand Down Expand Up @@ -324,6 +327,10 @@ def _get_parts(self) -> Iterator[str]:
Path('salt/metalk8s/kubernetes/ca/kubernetes/exported.sls'),
Path('salt/metalk8s/kubernetes/ca/kubernetes/init.sls'),
Path('salt/metalk8s/kubernetes/ca/kubernetes/installed.sls'),
Path('salt/metalk8s/kubernetes/ca/dex/init.sls'),
Path('salt/metalk8s/kubernetes/ca/dex/advertised.sls'),
Path('salt/metalk8s/kubernetes/ca/dex/dex-rootca.sls'),
Path('salt/metalk8s/kubernetes/ca/dex/dex-server.sls'),

Path('salt/metalk8s/kubernetes/cni/calico/configured.sls'),
Path('salt/metalk8s/kubernetes/cni/calico/deployed.sls'),
Expand Down
17 changes: 17 additions & 0 deletions salt/metalk8s/addons/dex/deployed/init.sls
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#
# State to manage dex
#
# Available states
# ================
#
# * namespace -> creates a namespace metalk8s-auth
# * dex-tls-secret -> creates dex certificates stored as k8s secret
# * chart -> charts used to deploy dex
# * dex-conf -> contains dex required configurations

include:
- .namespace
- .dex-tls-secret
- .dex-conf
- .dex-service
- .chart
4 changes: 4 additions & 0 deletions salt/metalk8s/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,7 @@
{% set kubeadm_kubeconfig = salt['grains.filter_by']({
'default': {}
}, merge=defaults.get('kubeadm_kubeconfig')) %}

{% set dex = salt['grains.filter_by']({
'default': {}
}, merge=defaults.get('dex')) %}

0 comments on commit 8bc02b2

Please sign in to comment.