diff --git a/application.yml b/application.yaml similarity index 100% rename from application.yml rename to application.yaml diff --git a/sidecarinit/commands.py b/sidecarinit/commands.py index eb3e8da..b0aa393 100644 --- a/sidecarinit/commands.py +++ b/sidecarinit/commands.py @@ -1,11 +1,12 @@ import click import os +import sys from pathlib import Path import sidecarinit.config as config import sidecarinit.download as download @click.command() -@click.argument('env_yml', required=False, default='/deployments/config/application.yml') #help='Target environment, Same as sidecar application.yml' +@click.argument('env_yml', required=False, default='/deployments/config/application.yaml') #help='Target environment, Same as sidecar application.yml' def run(env_yml): suite = config.read_config(env_yml) @@ -16,4 +17,6 @@ def run(env_yml): Path(suite.local_repository).mkdir(parents=True, exist_ok=True) Path(suite.local_repository + archive_name ).touch(exist_ok=True) - download.download_archive(suite.archive_api + archive_name, suite.local_repository) \ No newline at end of file + download.download_archive(suite.archive_api + archive_name, suite.local_repository) + + sys.exit(0); \ No newline at end of file diff --git a/template/template-sidecar.yaml b/template/template-sidecar.yaml index 176b20f..b67febe 100644 --- a/template/template-sidecar.yaml +++ b/template/template-sidecar.yaml @@ -4,7 +4,7 @@ metadata: labels: app: "sidecar" spec: - initcontainers: + initContainers: - name : sidecar-init image: quay.io/kaine/indy-sidecar-init:latest volumeMounts: @@ -17,6 +17,9 @@ spec: env: - name: HOME value: /deployments + command: + - "sidecar-init" + containers: - name: sidecar image: quay.io/kaine/indy-sidecar:latest imagePullPolicy: Always @@ -39,6 +42,10 @@ spec: ports: - containerPort: 8080 protocol: TCP + resources: + limits: + cpu: "1" + memory: "2Gi" - name: jnlp image: quay.io/factory2/jenkins-agent:maven-36-rhel7-latest imagePullPolicy: Always @@ -51,6 +58,10 @@ spec: subPath: settings.xml name: sidecar-config workingDir: /home/jenkins-11-openjdk + resources: + limits: + cpu: "2" + memory: "4Gi" volumes: - name: sidecar-config configMap: