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:
Carmen Rata 2021-06-15 23:25:02 -04:00
parent 9182c4f9b5
commit d413fe29ea
10 changed files with 24 additions and 25 deletions

12
config
View File

@ -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

View File

@ -4,4 +4,4 @@ RUN yum -y update
RUN yum -y install\
audit
ENTRYPOINT ["/sbin/auditd", "-l"]
ENTRYPOINT ["/sbin/auditd", "-f", "-l"]

View File

@ -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/@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
find . -type f ! -name '*.md5' -print0 | xargs -0 md5sum > checksum.md5
tar -zcf %{_builddir}/%{app_tarball} -C %{app_staging}/ .

View File

@ -1,5 +1,5 @@
maintain_user_overrides: true
app_name: @APP_NAME@
app_version: @APP_VERSION@
helm_repo: @HELM_REPO@
app_name: "@APP_NAME@"
app_version: "@APP_VERSION@"
helm_repo: "@HELM_REPO@"

View File

@ -1,5 +1,5 @@
apiVersion: v2
appVersion: "1.0"
description: A Helm chart for AUDIT service
name: audit-helm
description: A Helm chart for AUDIT service
name: audit
version: 1.0.0

View File

@ -4,4 +4,3 @@ metadata:
name: {{ .Values.configmap.name_auditd }}
data:
auditd.conf: {{ toYaml .Values.auditdconf | indent 2 }}

View File

@ -4,7 +4,7 @@
image:
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
debug: ''

View File

@ -8,7 +8,7 @@ data:
release: audit
namespace: kube-system
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
type: tar
reference: master

View File

@ -1,3 +1,4 @@
# hacking pulls in flake8
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
bashate >= 0.2
yamllint<1.26.1;python_version>="3.0" # GPLv2

15
tox.ini
View File

@ -31,5 +31,20 @@ commands =
-e 'E*'"
[testenv:linters]
basepython=python3
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