diff options
| -rw-r--r-- | .gitlab-ci.yml | 52 | ||||
| -rwxr-xr-x | kubernetes/contrib/components/ejbca/resources/ejbca-config.sh | 2 | ||||
| -rwxr-xr-x | kubernetes/policy/Chart.yaml | 8 | ||||
| -rwxr-xr-x | kubernetes/policy/templates/job.yaml | 2 |
4 files changed, 50 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b15de00b1..3c438a08d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,9 @@ stages: cla_authors: stage: linting - image: bitnami/git:2 + image: + name: bitnami/git:2 + entrypoint: [""] script: - . .ci/common.sh - title "Running cla authors retrieval..." @@ -34,7 +36,9 @@ cla_authors: pylint: stage: linting - image: cytopia/pylint + image: + name: cytopia/pylint + entrypoint: [""] script: - . .ci/common.sh - title "Running pylint check..." @@ -52,7 +56,9 @@ pylint: commit-message: stage: linting - image: jorisroovers/gitlint:0.16.0 + image: + name: jorisroovers/gitlint:0.16.0 + entrypoint: [""] script: - . .ci/common.sh - title "*** Running gitlint..." @@ -67,7 +73,9 @@ commit-message: trailing-whitespaces: stage: linting - image: alpine/git:v2.24.1 + image: + name: alpine/git:v2.24.1 + entrypoint: [""] script: - . .ci/common.sh - title "Running trailing whitespaces check..." @@ -81,7 +89,9 @@ trailing-whitespaces: tabs: stage: linting - image: alpine/git:v2.24.1 + image: + name: alpine/git:v2.24.1 + entrypoint: [""] script: - . .ci/common.sh - title "Running tabs check..." @@ -95,7 +105,9 @@ tabs: documentation:doc8: stage: linting - image: testthedocs/ttd-doc8 + image: + name: testthedocs/ttd-doc8 + entrypoint: [""] script: - . .ci/common.sh - title "Running doc8 check..." @@ -113,7 +125,9 @@ documentation:doc8: documentation:link-check: stage: linting - image: python:3.7 + image: + name: python:3.7 + entrypoint: [""] script: - . .ci/common.sh - pip install -r requirements.txt @@ -134,7 +148,9 @@ documentation:link-check: documentation:spelling: stage: linting - image: python:3.7 + image: + name: python:3.7 + entrypoint: [""] script: - . .ci/common.sh - apt-get update @@ -158,7 +174,9 @@ documentation:spelling: bashisms: stage: linting - image: manabu/checkbashisms-docker + image: + name: manabu/checkbashisms-docker + entrypoint: [""] script: - . .ci/common.sh - title "Running bashisms check..." @@ -175,7 +193,9 @@ helm:fast: services: - name: bitnami/chartmuseum:latest alias: chartmuseum - image: alpine/helm:3.6.3 + image: + name: alpine/helm:3.6.3 + entrypoint: [""] variables: SKIP_LINT: "TRUE" script: @@ -202,7 +222,9 @@ helm:full: services: - name: bitnami/chartmuseum:latest alias: chartmuseum - image: alpine/helm:3.6.3 + image: + name: alpine/helm:3.6.3 + entrypoint: [""] script: - . .ci/common.sh - apk add --no-cache make @@ -226,7 +248,9 @@ helm:full: documentation: stage: build - image: python:3.7 + image: + name: python:3.7 + entrypoint: [""] script: - . .ci/common.sh - apt-get update @@ -252,7 +276,9 @@ documentation: gating:launch: stage: test - image: busybox + image: + name: busybox + entrypoint: [""] script: - . .ci/common.sh - title "Launching request for a gate" diff --git a/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh b/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh index 94c95d6c30..a538238151 100755 --- a/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh +++ b/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh @@ -49,6 +49,8 @@ configureEjbca() { ejbca.sh roles changerule "Certificate Update Admin" /endentityprofilesrules/Custom_EndEntity/ ACCEPT ejbca.sh roles changerule "Certificate Update Admin" /ra_functionality/edit_end_entity/ ACCEPT ejbca.sh roles addrolemember "Certificate Update Admin" ManagementCA WITH_ORGANIZATION --value "{{ .Values.cmpv2Config.global.certificate.default.subject.organization }}" + # workarround to exit successfully, as a reexecution of "addrolemember" returns an error + exit 0 } diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml index 54e2103ce7..52c1b86f06 100755 --- a/kubernetes/policy/Chart.yaml +++ b/kubernetes/policy/Chart.yaml @@ -67,6 +67,14 @@ dependencies: version: ~10.x-0 repository: 'file://components/policy-clamp-cl-k8s-ppnt' condition: policy-clamp-cl-k8s-ppnt.enabled + - name: policy-clamp-cl-http-ppnt + version: ~10.x-0 + repository: 'file://components/policy-clamp-cl-http-ppnt' + condition: policy-clamp-cl-http-ppnt.enabled + - name: policy-clamp-cl-pf-ppnt + version: ~10.x-0 + repository: 'file://components/policy-clamp-cl-pf-ppnt' + condition: policy-clamp-cl-pf-ppnt.enabled - name: policy-clamp-cl-runtime version: ~10.x-0 repository: 'file://components/policy-clamp-cl-runtime' diff --git a/kubernetes/policy/templates/job.yaml b/kubernetes/policy/templates/job.yaml index d781a634ae..d59b5fe770 100755 --- a/kubernetes/policy/templates/job.yaml +++ b/kubernetes/policy/templates/job.yaml @@ -73,7 +73,7 @@ spec: {{ include "common.resources" . }} containers: - name: {{ include "common.release" . }}-policy-galera-db-migrator - image: {{ .Values.repository }}/{{ .Values.dbmigrator.image }} + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.dbmigrator.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - mountPath: /dbcmd-config/db_migrator_policy_init.sh |