diff --git a/.talismanignore b/.talismanignore index 2bca1bca7aed4248dd6519d10924f5b9fe66ab61..836b43da17925ed94bb68176a9e3a866962a1d9a 100644 --- a/.talismanignore +++ b/.talismanignore @@ -2,5 +2,6 @@ # that potential secrets or sensitive information do not leave the developer's workstation. # https://thoughtworks.github.io/talisman/ control/bashrc # ignore:filename +control/files/bin/rke ansible/roles/get_control/files/bash_aliases_oas # ignore:filename ansible/roles/get_control/files/bashrc_oas # ignore:filename diff --git a/ansible/roles/rke_configuration/templates/cluster.yml.j2 b/ansible/roles/rke_configuration/templates/cluster.yml.j2 index 60a3694b9d4c658099525938bf01c686601cafe6..829d6eb20faf87fe5ddc4f9e0c914914a4830458 100644 --- a/ansible/roles/rke_configuration/templates/cluster.yml.j2 +++ b/ansible/roles/rke_configuration/templates/cluster.yml.j2 @@ -84,7 +84,7 @@ authorization: mode: rbac options: {} ignore_docker_version: false -kubernetes_version: "v1.12.3-rancher1-1" +kubernetes_version: "v1.12.5-rancher1-1" private_registries: [] ingress: # Set this to none, so we can install traefik ourselves. diff --git a/control/Dockerfile b/control/Dockerfile index 2dabaabfc5ad26d1d140896ab5a3dff77533aa3b..343b1f9363951da1166d2161664c5caad7b72b7e 100644 --- a/control/Dockerfile +++ b/control/Dockerfile @@ -1,3 +1,5 @@ +# https://hub.docker.com/r/chatwork/helmfile/tags +# Version strings contains: helmfile version - helm version - ?? FROM chatwork/helmfile:0.43.2-2.12.3-1.11.7 LABEL name="Openappstack control image" LABEL version="0.3" diff --git a/control/files/bin/rke b/control/files/bin/rke index 1086b5450e741a66e1a330425676acd6f53a8e90..c2405948afadf04af80ea72f1e5d33cc03d86830 100755 Binary files a/control/files/bin/rke and b/control/files/bin/rke differ