From a69f8fddc7050da54ca6b3b8fc976bb0dbee0238 Mon Sep 17 00:00:00 2001
From: Chrysoula Dikonimaki <chrysoula.dikonimaki@cern.ch>
Date: Wed, 5 Mar 2025 11:09:15 +0000
Subject: [PATCH] Merge two webeos operators repositories: Replace webeos-site
operator binary instead of webeos-config operator
---
cc7/templates/deploymentconfig.yaml | 6 ------
el9/templates/deployment.yaml | 4 +++-
el9/values.yaml | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/cc7/templates/deploymentconfig.yaml b/cc7/templates/deploymentconfig.yaml
index 62e10c3..96c65f6 100644
--- a/cc7/templates/deploymentconfig.yaml
+++ b/cc7/templates/deploymentconfig.yaml
@@ -166,12 +166,6 @@ spec:
env:
- name: WATCH_NAMESPACE
value: {{ .Release.Namespace }}
- - name: POD_NAME
- valueFrom:
- fieldRef:
- fieldPath: metadata.name
- - name: OPERATOR_NAME
- value: "webeos-config-operator"
- name: OIDC_CRYPTOPASSPHRASE
valueFrom:
secretKeyRef:
diff --git a/el9/templates/deployment.yaml b/el9/templates/deployment.yaml
index 36ac0d6..dffe379 100644
--- a/el9/templates/deployment.yaml
+++ b/el9/templates/deployment.yaml
@@ -249,6 +249,8 @@ spec:
- name: controller
image: {{ .Values.containers.controller.image | quote }}
imagePullPolicy: Always
+ command:
+ - /bin/webeos-config
env:
- name: WATCH_NAMESPACE
value: {{ .Release.Namespace }}
@@ -257,7 +259,7 @@ spec:
fieldRef:
fieldPath: metadata.name
- name: OPERATOR_NAME
- value: "webeos-config-operator"
+ value: "webeos-site-operator"
- name: OIDC_CRYPTOPASSPHRASE
valueFrom:
secretKeyRef:
diff --git a/el9/values.yaml b/el9/values.yaml
index b708cf1..affa8d5 100644
--- a/el9/values.yaml
+++ b/el9/values.yaml
@@ -230,7 +230,7 @@ containers:
successThreshold: 1
controller:
- image: gitlab-registry.cern.ch/webservices/webeos/webeos-config-operator:RELEASE.2024.06.25T17-22-43Z
+ image: gitlab-registry.cern.ch/webservices/webeos/webeos-site-operator:RELEASE.2025.03.05T11-04-57Z
resources:
limits:
cpu: 250m
--
GitLab