From 56030bf94b815f89729c2c93e6b3e12ef2976890 Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Sat, 11 Nov 2023 15:21:57 -0600 Subject: [PATCH 1/2] update: overlays --- devspaces/NOTES.md | 34 ------------------- .../overlays/default/kustomization.yaml | 2 +- .../overlays/fix-autoscale/kustomization.yaml | 9 ----- .../overlays/low-idle/kustomization.yaml | 4 +-- 4 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 devspaces/NOTES.md delete mode 100644 devspaces/aggregate/overlays/fix-autoscale/kustomization.yaml rename devspaces/{instance => aggregate}/overlays/low-idle/kustomization.yaml (88%) diff --git a/devspaces/NOTES.md b/devspaces/NOTES.md deleted file mode 100644 index 11a1c830..00000000 --- a/devspaces/NOTES.md +++ /dev/null @@ -1,34 +0,0 @@ -# General Notes - -## Key images - -Init containers - -``` -# che / vscode image -registry.redhat.io/devspaces/code-rhel8 -# init container copies bins to `/checode` - -# project clone -registry.redhat.io/devworkspace/devworkspace-project-clone-rhel8 -``` - -Other containers - -``` -# che gateway -registry.redhat.io/devspaces/traefik-rhel8 - -# developer tools -https://github.com/devfile/developer-images - -# che docs -https://eclipse.dev/che/docs/stable/overview/introduction-to-eclipse-che/ -https://github.com/eclipse/che -``` - -Dashboard / devfile registry - -``` -https://github.com/eclipse-che/che-devfile-registry -``` diff --git a/devspaces/aggregate/overlays/default/kustomization.yaml b/devspaces/aggregate/overlays/default/kustomization.yaml index 713d4b98..1fabfb08 100644 --- a/devspaces/aggregate/overlays/default/kustomization.yaml +++ b/devspaces/aggregate/overlays/default/kustomization.yaml @@ -5,5 +5,5 @@ commonAnnotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true resources: - - ../../../instance/overlays/default + - ../../../instance/overlays/timeout-12m - ../../../operator/overlays/stable diff --git a/devspaces/aggregate/overlays/fix-autoscale/kustomization.yaml b/devspaces/aggregate/overlays/fix-autoscale/kustomization.yaml deleted file mode 100644 index 1fabfb08..00000000 --- a/devspaces/aggregate/overlays/fix-autoscale/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -commonAnnotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true - -resources: - - ../../../instance/overlays/timeout-12m - - ../../../operator/overlays/stable diff --git a/devspaces/instance/overlays/low-idle/kustomization.yaml b/devspaces/aggregate/overlays/low-idle/kustomization.yaml similarity index 88% rename from devspaces/instance/overlays/low-idle/kustomization.yaml rename to devspaces/aggregate/overlays/low-idle/kustomization.yaml index 84a9d4bc..2c6e8ffb 100644 --- a/devspaces/instance/overlays/low-idle/kustomization.yaml +++ b/devspaces/aggregate/overlays/low-idle/kustomization.yaml @@ -1,10 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: devspaces - resources: - - ../../base + - ../default patches: - target: From 5d82a55da431f9fdfd40f59822a3a985b1a1949b Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Sat, 2 Dec 2023 10:14:25 -0600 Subject: [PATCH 2/2] update: aggregate --- devspaces/aggregate/overlays/low-idle/kustomization.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devspaces/aggregate/overlays/low-idle/kustomization.yaml b/devspaces/aggregate/overlays/low-idle/kustomization.yaml index 2c6e8ffb..0076e3aa 100644 --- a/devspaces/aggregate/overlays/low-idle/kustomization.yaml +++ b/devspaces/aggregate/overlays/low-idle/kustomization.yaml @@ -2,7 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../default + - ../../../instance/overlays/timeout-12m + - ../../../operator/overlays/stable patches: - target: