Commit ada23b85 authored by Ľuboslav Pivarč's avatar Ľuboslav Pivarč
Browse files

Merge branch 'beta' into 'master'

Beta

See merge request !2
parents 578ca3bb 9d91a0d3
Pipeline #22563 passed with stages
in 20 seconds
......@@ -48,6 +48,7 @@ deploy to k8s:
stage: deploy
variables:
NAMESPACE: cbio-on-demand
DOMAIN: cbiood
<<: *kube-auth
image: registry.gitlab.ics.muni.cz:443/europdx/k8s/ci:latest
script:
......@@ -86,6 +87,7 @@ deploy to k8s beta:
stage: deploy
variables:
NAMESPACE: cbio-on-demand-beta
DOMAIN: cbiood-beta
<<: *kube-auth
image: registry.gitlab.ics.muni.cz:443/europdx/k8s/ci:latest
script:
......@@ -124,6 +126,7 @@ deploy to k8s dev:
stage: deploy
variables:
NAMESPACE: cbio-on-demand-dev
DOMAIN: cbiood-dev
<<: *kube-auth
image: registry.gitlab.ics.muni.cz:443/europdx/k8s/ci:latest
script:
......
......@@ -7,4 +7,5 @@ CI -> manual
- Cbio db image (using in API)
## Deploy
- Deploy all necessary stuff to k8s for cbio-on-demand
- Deploy all necessary configuration to k8s for cbio-on-demand
- ! Run deploy in "secure-routing" and "api" repositories !
......@@ -2,4 +2,5 @@ echo "Hi I am here"
cd yaml
for i in *; do
sed -i "s^__NAMESPACE__^${NAMESPACE}^" $i
sed -i "s^__DOMAIN__^${DOMAIN}^" $i
done
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: cbio-api
subjects:
- kind: ServiceAccount
name: cbio-api
namespace: __NAMESPACE__
roleRef:
kind: ClusterRole
name: cbio-api
apiGroup: rbac.authorization.k8s.io
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
name: fabric8-rbac
name: fabric8-rbac-__NAMESPACE__
subjects:
- kind: ServiceAccount
# Reference to upper's `metadata.name`
......
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: cbio-api
rules:
- apiGroups: [""]
resources: ["identifiers"]
verbs: ["VerbAll"]
apiVersion: v1
kind: ConfigMap
metadata:
name: mysql-cbio-db
namespace: __NAMESPACE__
data:
mysql.conf: "# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights
reserved.\n#\n# This program is free software; you can redistribute it and/or
modify\n# it under the terms of the GNU General Public License as published
by\n# the Free Software Foundation; version 2 of the License.\n#\n# This program
is distributed in the hope that it will be useful,\n# but WITHOUT ANY WARRANTY;
without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the\n# GNU General Public License for more details.\n#\n# You
should have received a copy of the GNU General Public License\n# along with
this program; if not, write to the Free Software\n# Foundation, Inc., 51 Franklin
St, Fifth Floor, Boston, MA 02110-1301 USA\n\n#\n# The MySQL Server configuration
file.\n#\n# For explanations see\n# http://dev.mysql.com/doc/mysql/en/server-system-variables.html\n\n[mysqld]\npid-file\t=
/var/run/mysqld/mysqld.pid\nsocket\t\t= /var/run/mysqld/mysqld.sock\ndatadir\t\t=
/var/lib/mysql\n#log-error\t= /var/log/mysql/error.log\n# By default we only
accept connections from localhost\n#bind-address\t= 127.0.0.1\n# Disabling symbolic-links
is recommended to prevent assorted security risks\nsymbolic-links=0\n\n#\n#
* Fine Tuning\n#\n\nkey_buffer_size = 4G\nmax_heap_table_size =
512M\ntmp_table_size = 512M\nmax_allowed_packet = 256M\nthread_stack
\ = 256K\nthread_cache_size = 20\n# This replaces the startup
script and checks MyISAM tables if needed\n# the first time they are touched\nmyisam-recover-options
\ = BACKUP\nmax_connections = 214\n#table_cache = 64\n#thread_concurrency
\ = 10\n#\n# * Query Cache Configuration\n#\nquery_cache_limit = 1M\nquery_cache_size
\ = 0\nquery_cache_type = 0\n\n\njoin_buffer_size = 16M\ntable_open_cache
= 400\n"
......@@ -8,10 +8,10 @@ metadata:
spec:
tls:
- hosts:
- cbiood.edirex.ics.muni.cz
- __DOMAIN__.edirex.ics.muni.cz
secretName: ingress
rules:
- host: cbiood.edirex.ics.muni.cz
- host: __DOMAIN__.edirex.ics.muni.cz
http:
paths:
- path: /
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment