diff --git a/artifactory/templates/job-image-repo-sync.yaml b/artifactory/templates/job-image-repo-sync.yaml new file mode 100644 index 00000000..7b86ec59 --- /dev/null +++ b/artifactory/templates/job-image-repo-sync.yaml @@ -0,0 +1,20 @@ +{{/* +Copyright 2017 The Openstack-Helm Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/}} + +{{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} +{{- $imageRepoSyncJob := dict "envAll" . "serviceName" "artifactory" -}} +{{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} +{{- end }} diff --git a/artifactory/values.yaml b/artifactory/values.yaml index f3564339..2df2cac2 100644 --- a/artifactory/values.yaml +++ b/artifactory/values.yaml @@ -33,7 +33,13 @@ images: db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 artifactory: quay.io/attcomdev/artifactory-pro-mysql:5.9.3 + image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" + local_registry: + active: false + exclude: + - dep_check + - image_repo_sync network: node_ports: @@ -49,6 +55,14 @@ network: node_port: 31776 dependencies: + dynamic: + common: + local_image_registry: + jobs: + - artifactory-image-repo-sync + services: + - endpoint: node + service: local_image_registry static: server: services: @@ -91,6 +105,13 @@ pod: limits: memory: "1024Mi" cpu: "2000m" + image_repo_sync: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" lifecycle: upgrades: deployments: @@ -136,6 +157,7 @@ manifests: configmap_bin: true configmap_etc: true statefulset: true + job_image_repo_sync: true job_db_init: true job_db_drop: false secret_db: true diff --git a/ranger-agent/templates/deployment-ranger-agent-api.yaml b/ranger-agent/templates/deployment-ranger-agent-api.yaml index 2950f90f..423b1373 100755 --- a/ranger-agent/templates/deployment-ranger-agent-api.yaml +++ b/ranger-agent/templates/deployment-ranger-agent-api.yaml @@ -16,13 +16,13 @@ limitations under the License. {{- if .Values.manifests.deployment_ranger_agent_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} + {{- $mounts_ranger_agent_api := .Values.pod.mounts.ranger_agent_api.ranger_agent_api }} {{- $mounts_ranger_agent_api_init := .Values.pod.mounts.ranger_agent_api.init_container }} {{- $serviceAccountName := "ranger-agent-api" }} -{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} +{{ tuple $envAll "api" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: apps/v1beta1 kind: Deployment @@ -48,7 +48,7 @@ spec: {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.ranger_agent_api.timeout | default "30" }} initContainers: -{{ tuple $envAll $dependencies $mounts_ranger_agent_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} +{{ tuple $envAll "api" $mounts_ranger_agent_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ranger-agent-api image: {{ .Values.images.tags.ranger_agent }} diff --git a/ranger-agent/templates/deployment-ranger-agent-engine.yaml b/ranger-agent/templates/deployment-ranger-agent-engine.yaml index 0e686817..c91ebae0 100755 --- a/ranger-agent/templates/deployment-ranger-agent-engine.yaml +++ b/ranger-agent/templates/deployment-ranger-agent-engine.yaml @@ -15,13 +15,12 @@ limitations under the License. */}} {{- if .Values.manifests.deployment_ranger_agent_engine }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.engine }} + {{- $mounts_ranger_agent_engine := .Values.pod.mounts.ranger_agent_engine.ranger_agent_engine }} {{- $mounts_ranger_agent_engine_init := .Values.pod.mounts.ranger_agent_engine.init_container }} {{- $serviceAccountName := "ranger-agent-engine" }} -{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} - +{{ tuple $envAll "engine" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: apps/v1beta1 kind: Deployment @@ -47,7 +46,7 @@ spec: {{ .Values.labels.engine.node_selector_key }}: {{ .Values.labels.engine.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.ranger_agent_engine.timeout | default "30" }} initContainers: -{{ tuple $envAll $dependencies $mounts_ranger_agent_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} +{{ tuple $envAll "engine" $mounts_ranger_agent_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ranger-agent-engine image: {{ .Values.images.tags.ranger_agent }} diff --git a/ranger-agent/templates/job-image-repo-sync.yaml b/ranger-agent/templates/job-image-repo-sync.yaml new file mode 100644 index 00000000..720d67b4 --- /dev/null +++ b/ranger-agent/templates/job-image-repo-sync.yaml @@ -0,0 +1,20 @@ +{{/* +Copyright 2017 The Openstack-Helm Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/}} + +{{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} +{{- $imageRepoSyncJob := dict "envAll" . "serviceName" "ranger-agent" -}} +{{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} +{{- end }} diff --git a/ranger-agent/templates/pod-test.yaml b/ranger-agent/templates/pod-test.yaml index 2be759e8..7b99b057 100644 --- a/ranger-agent/templates/pod-test.yaml +++ b/ranger-agent/templates/pod-test.yaml @@ -16,13 +16,12 @@ limitations under the License. {{- if .Values.manifests.pod_test }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.static.tests }} {{- $mounts_tests := .Values.pod.mounts.ranger_agent_tests.ranger_agent_tests }} {{- $mounts_tests_init := .Values.pod.mounts.ranger_agent_tests.init_container }} {{- $serviceAccountName := print $envAll.Release.Name "-test" }} -{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} +{{ tuple $envAll "tests" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- apiVersion: v1 kind: Pod @@ -36,7 +35,7 @@ spec: {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} restartPolicy: Never initContainers: -{{ tuple $envAll $dependencies $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} +{{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} containers: - name: {{.Release.Name}}-test image: {{ .Values.images.tags.scripted_test }} diff --git a/ranger-agent/values.yaml b/ranger-agent/values.yaml index d3fef1af..82babf24 100755 --- a/ranger-agent/values.yaml +++ b/ranger-agent/values.yaml @@ -43,9 +43,15 @@ images: ks_service: docker.io/openstackhelm/heat:newton rabbit_init: docker.io/rabbitmq:3.7-management ks_endpoints: docker.io/openstackhelm/heat:newton - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 scripted_test: docker.io/openstackhelm/heat:newton + image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" + local_registry: + active: false + exclude: + - dep_check + - image_repo_sync conf: paste: @@ -105,6 +111,14 @@ network: port: 30010 dependencies: + dynamic: + common: + local_image_registry: + jobs: + - ranger-agent-image-repo-sync + services: + - endpoint: node + service: local_image_registry static: api: jobs: @@ -226,9 +240,9 @@ endpoints: ranger_rds: name: rds-url hosts: - default: + default: rds host_fqdn_override: - default: internal.ranger.com + default: null path: default: /v1/rds/status scheme: @@ -428,6 +442,13 @@ pod: limits: memory: "1024Mi" cpu: "2000m" + image_repo_sync: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" manifests: configmap_bin: true @@ -442,6 +463,7 @@ manifests: job_db_init: true job_db_sync: true job_db_drop: false + job_image_repo_sync: true job_ks_endpoints: true job_ks_service: true job_ks_user: true