Skip to content

Drop special cased eso overrides now that eso 1.1 exists for ocp 4.18 onwards #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbaldessari wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Drop special cased eso overrides now that eso 1.1 exists for ocp 4.18 onwards #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/all/config-demo/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ secretStore:
name: vault-backend
kind: ClusterSecretStore

esoversion: "external-secrets.io/v1beta1"
Copy link
Copy Markdown
Contributor

@dminnear-rh dminnear-rh Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we still want to keep this value around? the new ESO operator only supports external-secrets.io/v1 so maybe we just hard code that?

esoversion: "external-secrets.io/v1"
configdemosecret:
key: secret/data/global/config-demo
refreshInterval: 5m0s
Expand Down
24 changes: 0 additions & 24 deletions values-4.20-group-one.yaml
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions values-4.20-hub.yaml
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions values-4.21-group-one.yaml
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions values-4.21-hub.yaml
View file
Open in desktop

This file was deleted.

23 changes: 15 additions & 8 deletions values-group-one.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,27 @@ clusterGroup:
namespaces:
config-demo:
hello-world:
golang-external-secrets:
# The only subscription on spokes is gitops which gets managed by ACM
# subscriptions:
external-secrets-operator:
operatorGroup: true
targetNamespaces: []
external-secrets:
# The gitops subscription on spokes gets managed by ACM
subscriptions:
eso:
name: openshift-external-secrets-operator
namespace: external-secrets-operator
channel: stable-v1
argoProjects:
- eso
- config-demo
- hello-world
applications:
golang-external-secrets:
name: golang-external-secrets
namespace: golang-external-secrets
openshift-external-secrets:
name: openshift-external-secrets
namespace: external-secrets
argoProject: eso
chart: golang-external-secrets
chartVersion: 0.2.*
chart: openshift-external-secrets
chartVersion: 0.0.*
config-demo:
name: config-demo
namespace: config-demo
Expand Down
19 changes: 13 additions & 6 deletions values-hub.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ clusterGroup:
namespaces:
open-cluster-management:
vault:
golang-external-secrets:
external-secrets-operator:
operatorGroup: true
targetNamespaces: []
external-secrets:
config-demo:
hello-world:
subscriptions:
Expand All @@ -13,6 +16,10 @@ clusterGroup:
namespace: open-cluster-management
channel: release-2.16
# csv: advanced-cluster-management.v2.6.1
eso:
name: openshift-external-secrets-operator
namespace: external-secrets-operator
channel: stable-v1
argoProjects:
- hub
- config-demo
Expand Down Expand Up @@ -51,12 +58,12 @@ clusterGroup:
argoProject: hub
chart: hashicorp-vault
chartVersion: 0.1.*
golang-external-secrets:
name: golang-external-secrets
namespace: golang-external-secrets
openshift-external-secrets:
name: openshift-external-secrets
namespace: external-secrets
argoProject: hub
chart: golang-external-secrets
chartVersion: 0.2.*
chart: openshift-external-secrets
chartVersion: 0.0.*
config-demo:
name: config-demo
namespace: config-demo
Expand Down
20 changes: 11 additions & 9 deletions values-standalone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
clusterGroup:
name: standalone
namespaces:
- vault
- golang-external-secrets
- config-demo
- hello-world
vault:
external-secrets-operator:
operatorGroup: true
targetNamespaces: []
config-demo:
hello-world:
subscriptions: {}
argoProjects:
- hub
Expand All @@ -28,12 +30,12 @@ clusterGroup:
argoProject: hub
chart: hashicorp-vault
chartVersion: 0.1.*
golang-external-secrets:
name: golang-external-secrets
namespace: golang-external-secrets
openshift-external-secrets:
name: openshift-external-secrets
namespace: external-secrets
argoProject: hub
chart: golang-external-secrets
chartVersion: 0.1.*
chart: openshift-external-secrets
chartVersion: 0.0.*
config-demo:
name: config-demo
namespace: config-demo
Expand Down
Loading