From 52e4cff97e8915152c9dd6c4ce505a8d84f0dc50 Mon Sep 17 00:00:00 2001
From: Pasha Radchenko <pradchenko@webmonitorx.ru>
Date: Fri, 14 Feb 2025 17:39:00 +0300
Subject: [PATCH 1/2] DEVOPS-1257: Update img path
---
charts/ingress-nginx/values.yaml | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index 9bb1fe1fe..3f223398d 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -1000,98 +1000,98 @@ controller:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
appstructure:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
bruteDetect:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
collectd:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
cookiesMonitoring:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
exportAttacks:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
exportCounters:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
exportEnvironment:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
exportMetrics:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
syncIpListsSource:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
syncIpLists:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
syncMarkers:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
syncNode:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
weakJwtDetect:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
resources: {}
--
GitLab
From 0039f975b217303bbb9950e68214ff851184ed91 Mon Sep 17 00:00:00 2001
From: Pasha Radchenko <pradchenko@webmonitorx.ru>
Date: Fri, 14 Feb 2025 17:51:06 +0300
Subject: [PATCH 2/2] DEVOPS-1257: Update img path
---
.gitlab-ci.yml | 10 -------
charts/ingress-nginx/templates/_helpers.tpl | 30 ++++++++++-----------
charts/ingress-nginx/values.yaml | 2 +-
rootfs/Dockerfile | 2 +-
rootfs/Dockerfile-chroot | 2 +-
5 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4d848476..643c988f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -336,15 +336,6 @@ PUBLISH_INGRESS_VEX:
- !!merge <<: *apps
tags:
- public
-TRIGGER:
- stage: trigger
- trigger:
- project: wmx-public/helm-index
- branch: main
- strategy: depend
- only:
- variables:
- - ($X_CI_BUILD_KIND == "production")
E2E_CHART_TESTS:
timeout: 3h 30m
stage: test
@@ -421,7 +412,6 @@ stages:
- prepare
- build
- postbuild
- - trigger
- test
- sign
- verify
diff --git a/charts/ingress-nginx/templates/_helpers.tpl b/charts/ingress-nginx/templates/_helpers.tpl
index c646f4a47..138557b7c 100644
--- a/charts/ingress-nginx/templates/_helpers.tpl
+++ b/charts/ingress-nginx/templates/_helpers.tpl
@@ -261,7 +261,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
{{- if eq .Values.controller.wallarm.fallback "on" }}
@@ -301,7 +301,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
command: ["/opt/wallarm/appstructure_ep.sh"]
@@ -333,7 +333,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/brute-detect_ep.sh"]
env:
@@ -356,7 +356,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/collectd_ep.sh"]
env:
@@ -385,7 +385,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/cookies-monitoring_ep.sh"]
env:
@@ -408,7 +408,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/export-attacks_ep.sh"]
env:
@@ -431,7 +431,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/export-counters_ep.sh"]
env:
@@ -454,7 +454,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/export-environment_ep.sh"]
env:
@@ -480,7 +480,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/export-metrics_ep.sh"]
env:
@@ -503,7 +503,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/sync-ip-lists-source_ep.sh"]
env:
@@ -526,7 +526,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/sync-ip-lists_ep.sh"]
env:
@@ -549,7 +549,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/sync-markers_ep.sh"]
env:
@@ -572,7 +572,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/syncnode_ep.sh"]
env:
@@ -595,7 +595,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/tarantool_ep.sh"]
imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
@@ -642,7 +642,7 @@ readOnlyRootFilesystem: false
image: {{ .registry }}/{{ .image }}:{{ .tag }}
{{- end }}
{{- else }}
- image: "registry.webmonitorx.ru/public/ingress-wmx:{{ .Values.controller.image.tag }}"
+ image: "registry.webmonitorx.ru/public/ingress/ingress-wmx:{{ .Values.controller.image.tag }}"
{{- end }}
command: ["/opt/wallarm/weak-jwt-detect_ep.sh"]
env:
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index 3f223398d..f463fec20 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -955,7 +955,7 @@ controller:
image: {}
# image:
# registry: registry.webmonitorx.ru
- # image: public/ingress
+ # image: public/ingress/ingress-wmx
# tag: 4.8.1-4
service:
annotations: {}
diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
index 7fd383510..73ba2a740 100644
--- a/rootfs/Dockerfile
+++ b/rootfs/Dockerfile
@@ -13,7 +13,7 @@
# limitations under the License.
ARG VERSION
ARG BASE_IMAGE
-FROM registry.webmonitorx.ru/public/ingress-wmx:${VERSION} as wmxmega
+FROM registry.webmonitorx.ru/public/ingress/ingress-wmx:${VERSION} as wmxmega
FROM "${BASE_IMAGE}"
diff --git a/rootfs/Dockerfile-chroot b/rootfs/Dockerfile-chroot
index c0772f8d3..4cac8f3bb 100644
--- a/rootfs/Dockerfile-chroot
+++ b/rootfs/Dockerfile-chroot
@@ -13,7 +13,7 @@
# limitations under the License
ARG VERSION
ARG BASE_IMAGE
-FROM registry.webmonitorx.ru/public/ingress-wmx:${VERSION} as wmxmega
+FROM registry.webmonitorx.ru/public/ingress/ingress-wmx:${VERSION} as wmxmega
FROM ${BASE_IMAGE} as chroot
--
GitLab