Merge pull request #151 from wallarm/DE-81

DE-81 Helm 4.10.5

.github/workflows/build.yaml

@@ -13,7 +13,7 @@ permissions:
 jobs:
   build:
     name: Build and push images
-    runs-on: self-hosted-amd64-1cpu
+    runs-on: self-hosted-amd64-4cpu
     steps:
       - name: Checkout
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.0.2

Dockerfile

@@ -2,21 +2,6 @@ ARG ALPINE_VERSION
 ARG GOLANG_VERSION
 FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as builder
 
-ARG ALPINE_VERSION
-ARG GOLANG_VERSION
-ARG CONTAINER_VERSION
-ARG COMMIT_SHA
-
-LABEL org.opencontainers.image.authors="Wallarm Support Team <[email protected]>"
-LABEL org.opencontainers.image.title="Kubernetes Sidecar controller of Wallarm API Security deployment"
-LABEL org.opencontainers.image.documentation="https://docs.wallarm.com/installation/kubernetes/sidecar-proxy/deployment/"
-LABEL org.opencontainers.image.source="https://github.com/wallarm/sidecar"
-LABEL org.opencontainers.image.vendor="Wallarm"
-LABEL org.opencontainers.image.version="${CONTAINER_VERSION}"
-LABEL org.opencontainers.image.revision="${COMMIT_SHA}"
-LABEL com.wallarm.sidecar-controller.versions.alpine="${ALPINE_VERSION}"
-LABEL com.wallarm.sidecar-controller.versions.golang="${GOLANG_VERSION}"
-
 RUN apk add --no-cache                         \
         bash                                   \
         git                                    \
@@ -30,14 +15,30 @@ RUN go mod download
 ARG TARGETARCH
 ARG CGO_ENABLED=0
 ARG GOOS=linux
-ARG GOARCH=$TARGETARCH
+ARG GOARCH=${TARGETARCH}
 RUN go test -v .                            && \
     go build -a -ldflags="-s -w"               \
         -o sidecar-controller .             && \
     upx -9 sidecar-controller
 
+ARG ALPINE_VERSION
 FROM alpine:${ALPINE_VERSION}
 
+ARG ALPINE_VERSION
+ARG GOLANG_VERSION
+ARG CONTAINER_VERSION
+ARG COMMIT_SHA
+
+LABEL org.opencontainers.image.authors="Wallarm Support Team <[email protected]>"
+LABEL org.opencontainers.image.title="Kubernetes Sidecar controller of Wallarm API Security deployment"
+LABEL org.opencontainers.image.documentation="https://docs.wallarm.com/installation/kubernetes/sidecar-proxy/deployment/"
+LABEL org.opencontainers.image.source="https://github.com/wallarm/sidecar"
+LABEL org.opencontainers.image.vendor="Wallarm"
+LABEL org.opencontainers.image.version="${CONTAINER_VERSION}"
+LABEL org.opencontainers.image.revision="${COMMIT_SHA}"
+LABEL com.wallarm.sidecar-controller.versions.alpine="${ALPINE_VERSION}"
+LABEL com.wallarm.sidecar-controller.versions.golang="${GOLANG_VERSION}"
+
 ARG UID=65222
 ARG GID=65222
 RUN apk update                              && \

TAG

@@ -1 +1 @@
-1.3.6
+1.3.7

helm/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: wallarm-sidecar
-version: 4.10.4
-appVersion: 4.10.4-1
+version: 4.10.5
+appVersion: 4.10.5-1
 description: Sidecar controller for Kubernetes. Injects sidecar proxy based on NGINX with Wallarm module and helper services.
 home: https://github.com/wallarm/sidecar
 icon: https://static.wallarm.com/wallarm-logo.svg
@@ -21,8 +21,8 @@ kubeVersion: ">=1.19.16-0"
 annotations:
   artifacthub.io/images: |
     - name: sidecar
-      image: wallarm/sidecar:4.10.4-1
+      image: wallarm/sidecar:4.10.5-1
     - name: sidecar-controller
-      image: wallarm/sidecar-controller:1.3.6
+      image: wallarm/sidecar-controller:1.3.7
     - name: node-helpers
-      image: wallarm/node-helpers:4.10.4-1
+      image: wallarm/node-helpers:4.10.5-1

helm/values.yaml

@@ -183,7 +183,7 @@ config:
     image:
       registry: docker.io
       image: wallarm/sidecar
-      tag: "4.10.4-1"
+      tag: 4.10.5-1
       pullPolicy: IfNotPresent
     ### Shared security context for all (init and regular) containers in sidecar schema except `iptables` container.
     ### For `iptables` container it is described in `sidecar.initContainers.iptables.securityContext` value
@@ -346,9 +346,9 @@ imagePullSecrets: []
 
 helper:
   image:
-    registry: "docker.io"
-    image: "wallarm/node-helpers"
-    tag: "4.10.4-1"
+    registry: docker.io
+    image: wallarm/node-helpers
+    tag: 4.10.5-1
     pullPolicy: IfNotPresent
 
 ### Configuration for post-analytics module
@@ -785,7 +785,7 @@ controller:
   image:
     registry: docker.io
     image: wallarm/sidecar-controller
-    tag: 1.3.6
+    tag: 1.3.7
     pullPolicy: IfNotPresent
   # -- Admission webhook configuration
   # @default -- *See below for details*

test/smoke/run-smoke-suite.sh

@@ -188,7 +188,8 @@ spec:
         BRANCH:${GITHUB_REF_NAME:-local},
         JOB:${GITHUB_JOB:-local},
         K8S:${ALLURE_ENVIRONMENT_K8S:-},
-        ARCH:${ALLURE_ENVIRONMENT_ARCH:-}
+        ARCH:${ALLURE_ENVIRONMENT_ARCH:-},
+        GITHUB_REPO:${GITHUB_REPOSITORY:-}
     - name: ALLURE_LAUNCH_NAME
       value: >
         ${GITHUB_WORKFLOW:-local}-${GITHUB_RUN_ID:-local}-${GITHUB_JOB:-local}-