Update audit container image tag in charts
Update the docker image tag in values.yaml as part of helm charts configuration. Also updated Dockerfile and added yamllint configuration. Story: 2008849 Task: 42619 Signed-off-by: Carmen Rata <carmen.rata@windriver.com> Change-Id: I257c8715258498020c518d795e21fd3f862c676a
This commit is contained in:
12
config
12
config
@@ -1,12 +0,0 @@
|
|||||||
[core]
|
|
||||||
repositoryformatversion = 0
|
|
||||||
filemode = true
|
|
||||||
bare = false
|
|
||||||
logallrefupdates = true
|
|
||||||
[remote "origin"]
|
|
||||||
url = https://opendev.org/starlingx/audit-armada-app.git
|
|
||||||
fetch = +refs/heads/*:refs/remotes/origin/*
|
|
||||||
[branch "master"]
|
|
||||||
remote = origin
|
|
||||||
merge = refs/heads/master
|
|
||||||
rebase = true
|
|
@@ -4,4 +4,4 @@ RUN yum -y update
|
|||||||
RUN yum -y install\
|
RUN yum -y install\
|
||||||
audit
|
audit
|
||||||
|
|
||||||
ENTRYPOINT ["/sbin/auditd", "-l"]
|
ENTRYPOINT ["/sbin/auditd", "-f", "-l"]
|
||||||
|
@@ -55,10 +55,6 @@ sed -i 's/@APP_NAME@/%{app_name}/g' %{app_staging}/metadata.yaml
|
|||||||
sed -i 's/@APP_VERSION@/%{version}-%{tis_patch_ver}/g' %{app_staging}/metadata.yaml
|
sed -i 's/@APP_VERSION@/%{version}-%{tis_patch_ver}/g' %{app_staging}/metadata.yaml
|
||||||
sed -i 's/@HELM_REPO@/%{helm_repo}/g' %{app_staging}/metadata.yaml
|
sed -i 's/@HELM_REPO@/%{helm_repo}/g' %{app_staging}/metadata.yaml
|
||||||
|
|
||||||
# Copy the plugins: installed in the buildroot
|
|
||||||
# mkdir -p %{app_staging}/plugins
|
|
||||||
# cp /plugins/%{app_name}/*.whl %{app_staging}/plugins
|
|
||||||
|
|
||||||
# package it up
|
# package it up
|
||||||
find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
|
find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
|
||||||
tar -zcf %{_builddir}/%{app_tarball} -C %{app_staging}/ .
|
tar -zcf %{_builddir}/%{app_tarball} -C %{app_staging}/ .
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
maintain_user_overrides: true
|
maintain_user_overrides: true
|
||||||
|
|
||||||
app_name: @APP_NAME@
|
app_name: "@APP_NAME@"
|
||||||
app_version: @APP_VERSION@
|
app_version: "@APP_VERSION@"
|
||||||
helm_repo: @HELM_REPO@
|
helm_repo: "@HELM_REPO@"
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
appVersion: "1.0"
|
appVersion: "1.0"
|
||||||
description: A Helm chart for AUDIT service
|
description: A Helm chart for AUDIT service
|
||||||
name: audit-helm
|
name: audit
|
||||||
version: 1.0.0
|
version: 1.0.0
|
||||||
|
@@ -4,4 +4,3 @@ metadata:
|
|||||||
name: {{ .Values.configmap.name_auditd }}
|
name: {{ .Values.configmap.name_auditd }}
|
||||||
data:
|
data:
|
||||||
auditd.conf: {{ toYaml .Values.auditdconf | indent 2 }}
|
auditd.conf: {{ toYaml .Values.auditdconf | indent 2 }}
|
||||||
|
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
image:
|
image:
|
||||||
repository: docker.io/starlingx/stx-audit
|
repository: docker.io/starlingx/stx-audit
|
||||||
tag: dev-centos-stable-2021.05.22.21.26.0
|
tag: stx.6.0-v1.0.0
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
debug: ''
|
debug: ''
|
||||||
|
|
||||||
|
@@ -8,7 +8,7 @@ data:
|
|||||||
release: audit
|
release: audit
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
source:
|
source:
|
||||||
location: http://172.17.0.1:8080/helm_charts/stx-platform/audit-helm-1.0.0.tgz
|
location: http://172.17.0.1:8080/helm_charts/stx-platform/audit-1.0.0.tgz
|
||||||
subpath: audit
|
subpath: audit
|
||||||
type: tar
|
type: tar
|
||||||
reference: master
|
reference: master
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
# hacking pulls in flake8
|
# hacking pulls in flake8
|
||||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||||
bashate >= 0.2
|
bashate >= 0.2
|
||||||
|
yamllint<1.26.1;python_version>="3.0" # GPLv2
|
||||||
|
15
tox.ini
15
tox.ini
@@ -31,5 +31,20 @@ commands =
|
|||||||
-e 'E*'"
|
-e 'E*'"
|
||||||
|
|
||||||
[testenv:linters]
|
[testenv:linters]
|
||||||
|
basepython=python3
|
||||||
commands =
|
commands =
|
||||||
{[testenv:bashate]commands}
|
{[testenv:bashate]commands}
|
||||||
|
{[testenv:yamllint]commands}
|
||||||
|
|
||||||
|
[testenv:yamllint]
|
||||||
|
basepython=python3
|
||||||
|
commands =
|
||||||
|
|
||||||
|
bash -c "find {toxinidir} \
|
||||||
|
-name .tox -prune \
|
||||||
|
-o -type f -name '*.yaml' \
|
||||||
|
-print0 | xargs -0 yamllint -d relaxed -f parsable"
|
||||||
|
|
||||||
|
[testenv:flake8]
|
||||||
|
basepython = python3
|
||||||
|
description = Dummy environment to allow flake8 to be run in subdir tox
|
||||||
|
Reference in New Issue
Block a user