mirror of
https://github.com/outbackdingo/cozystack.git
synced 2026-03-20 22:41:18 +00:00
resolve conflicts
This commit is contained in:
@@ -123,7 +123,13 @@ releases:
|
||||
releaseName: snapshot-controller
|
||||
chart: cozy-snapshot-controller
|
||||
namespace: cozy-snapshot-controller
|
||||
dependsOn: [cilium,cert-manager-issuers]
|
||||
dependsOn: [cilium,cert-manager-issuers]
|
||||
|
||||
- name: objectstorage-controller
|
||||
releaseName: objectstorage-controller
|
||||
chart: cozy-objectstorage-controller
|
||||
namespace: cozy-objectstorage-controller
|
||||
dependsOn: [cilium]
|
||||
|
||||
- name: linstor
|
||||
releaseName: linstor
|
||||
|
||||
@@ -161,6 +161,12 @@ releases:
|
||||
namespace: cozy-snapshot-controller
|
||||
dependsOn: [cilium,kubeovn,cert-manager-issuers]
|
||||
|
||||
- name: objectstorage-controller
|
||||
releaseName: objectstorage-controller
|
||||
chart: cozy-objectstorage-controller
|
||||
namespace: cozy-objectstorage-controller
|
||||
dependsOn: [cilium,kubeovn]
|
||||
|
||||
- name: telepresence
|
||||
releaseName: traffic-manager
|
||||
chart: cozy-telepresence
|
||||
|
||||
@@ -1 +1 @@
|
||||
ghcr.io/aenix-io/cozystack/dashboard:latest
|
||||
ghcr.io/aenix-io/cozystack/dashboard:latest
|
||||
|
||||
@@ -1 +1 @@
|
||||
ghcr.io/aenix-io/cozystack/kubeapps-apis:latest
|
||||
ghcr.io/aenix-io/cozystack/kubeapps-apis:latest
|
||||
|
||||
Reference in New Issue
Block a user