Remove control and re-use setup into kubernetes
Change-Id: I93b6addae974e796e5604852214fb7d28884e54b
diff --git a/devops_portal/files/kubernetes/devops_portal-deploy.yaml b/devops_portal/files/kubernetes/devops_portal-deploy.yaml
index d6fced2..f49c92d 100644
--- a/devops_portal/files/kubernetes/devops_portal-deploy.yaml
+++ b/devops_portal/files/kubernetes/devops_portal-deploy.yaml
@@ -1,5 +1,5 @@
{%- from "devops_portal/map.jinja" import config with context %}
-{%- set container = config.container %}
+{%- from "devops_portal/map.jinja" import setup with context %}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@@ -13,7 +13,7 @@
spec:
containers:
- name: nginx
- image: {{ container.image }}
+ image: {{ setup.kubernetes.image }}
env:
- name: CONFIGMAP_HASH
value: {{ salt['hashutil.digest_file'](config.base_dir + '/kubernetes/devops_portal-cm.yaml') }}
@@ -25,11 +25,11 @@
mountPath: /opt/devops-portal/config
readOnly: true
ports:
- - containerPort: {{ container.container_port }}
+ - containerPort: 8000
livenessProbe:
httpGet:
path: /
- port: {{ container.container_port }}
+ port: 8000
initialDelaySeconds: 10
timeoutSeconds: 1
volumes:
diff --git a/devops_portal/files/kubernetes/devops_portal-svc.yaml b/devops_portal/files/kubernetes/devops_portal-svc.yaml
index ea102f8..24fabc4 100644
--- a/devops_portal/files/kubernetes/devops_portal-svc.yaml
+++ b/devops_portal/files/kubernetes/devops_portal-svc.yaml
@@ -1,5 +1,4 @@
-{%- from "devops_portal/map.jinja" import config with context %}
-{%- set container = config.container %}
+{%- from "devops_portal/map.jinja" import setup with context %}
apiVersion: v1
kind: Service
metadata:
@@ -10,7 +9,7 @@
ports:
- name: http
protocol: TCP
- port: {{ container.external_port }}
- targetPort: {{ container.container_port }}
+ port: {{ setup.kubernetes.external_port }}
+ targetPort: 8000
externalIPs:
- - {{ container.external_ip }}
+ - {{ setup.kubernetes.external_ip }}
diff --git a/devops_portal/setup/kubernetes.sls b/devops_portal/setup/kubernetes.sls
index ecafbe1..16e886e 100644
--- a/devops_portal/setup/kubernetes.sls
+++ b/devops_portal/setup/kubernetes.sls
@@ -1,6 +1,7 @@
{%- from "devops_portal/map.jinja" import config with context %}
-{%- if config.setup.engine == "kubernetes" %}
-{%- set namespace = config.setup.kubernetes.namespace|default("oss") %}
+{%- from "devops_portal/map.jinja" import setup with context %}
+{%- if setup.engine == "kubernetes" %}
+{%- set namespace = setup.kubernetes.namespace|default("oss") %}
devops_portal_kubernetes_dir:
file.directory:
diff --git a/metadata/service/control/all.yml b/metadata/service/control/all.yml
deleted file mode 100644
index 9d7a265..0000000
--- a/metadata/service/control/all.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-classes:
- - service.devops_portal.control.single
- - service.devops_portal.services.artifactory
- - service.devops_portal.services.elasticsearch
- - service.devops_portal.services.gerrit
- - service.devops_portal.services.grafana
- - service.devops_portal.services.jenkins
- - service.devops_portal.services.kibana
- - service.devops_portal.services.riverdelta
- - service.devops_portal.services.rundeck
-parameters:
- _param:
- devops_portal_artifactory_url: http://34.199.112.198:3001/
- devops_portal_elasticsearch_url: http://34.199.123.167:9200/
- devops_portal_gerrit_url: http://34.199.123.149:8181/
- devops_portal_grafana_url: http://34.199.112.198:4000/
-
- devops_portal_jenkins_url: http://34.199.112.198:8282/
- devops_portal_jenkins_username: admin
- devops_portal_jenkins_password: cloudplatform
-
- devops_portal_kibana_url: http://34.199.112.198:5601/
- devops_portal_riverdelta_url: http://34.199.124.21:8080/
-
- devops_portal_rundeck_url: http://34.199.112.198:4440/
- devops_portal_rundeck_token: cloudplatform
- devops_portal_rundeck_username: admin
- devops_portal_rundeck_password: cloudplatform
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
deleted file mode 100644
index 2651b49..0000000
--- a/metadata/service/control/single.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-applications:
- - devops_portal
-parameters:
- _param:
- devops_portal_setup_engine: kubernetes
- devops_portal_k8s_namespace: oss
- devops_portal_image: docker-sandbox.sandbox.mirantis.net/ikharin/oss/devops-portal:latest
- devops_portal_external_port: 8000
- devops_portal:
- control:
- enabled: true
- setup:
- engine: ${_param:devops_portal_setup_engine}
- kubernetes:
- namespace: ${_param:devops_portal_k8s_namespace}
- container:
- image: ${_param:devops_portal_image}
- external_ip: ${_param:devops_portal_external_ip}
- external_port: ${_param:devops_portal_external_port}
- container_port: 8000
- services: {}
diff --git a/metadata/service/kubernetes.yml b/metadata/service/kubernetes.yml
new file mode 100644
index 0000000..00946da
--- /dev/null
+++ b/metadata/service/kubernetes.yml
@@ -0,0 +1,16 @@
+applications:
+ - devops_portal
+parameters:
+ _param:
+ devops_portal_k8s_namespace: oss
+ devops_portal_external_port: 8800
+ docker_image_devops_portal: docker-sandbox.sandbox.mirantis.net/ikharin/oss/devops-portal:latest
+ devops_portal:
+ setup:
+ enabled: true
+ engine: kubernetes
+ kubernetes:
+ namespace: ${_param:devops_portal_k8s_namespace}
+ image: ${_param:devops_portal_image}
+ external_ip: ${_param:devops_portal_external_ip}
+ external_port: ${_param:devops_portal_external_port}