From 67b8beb35c54ac2e3fafcdabfa6f91c85244db4b Mon Sep 17 00:00:00 2001 From: John Dietz Date: Wed, 10 Sep 2025 13:41:38 -0400 Subject: [PATCH 1/2] ensure finalizers are set on all apps --- .../cluster-autoscaler-aws/application.yaml | 2 ++ .../application.yaml | 5 ++++ index.yaml | 24 ------------------- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/cluster-autoscaler-aws/components/cluster-autoscaler-aws/application.yaml b/cluster-autoscaler-aws/components/cluster-autoscaler-aws/application.yaml index f17a41f..bb7380e 100644 --- a/cluster-autoscaler-aws/components/cluster-autoscaler-aws/application.yaml +++ b/cluster-autoscaler-aws/components/cluster-autoscaler-aws/application.yaml @@ -8,6 +8,8 @@ metadata: argocd.argoproj.io/sync-wave: '20' kubefirst.konstruct.io/application-name: cluster-autoscaler-aws kubefirst.konstruct.io/source: catalog-templates + finalizers: + - resources-finalizer.argocd.argoproj.io spec: project: source: diff --git a/grapple-solution-framework/components/grapple-solution-framework/application.yaml b/grapple-solution-framework/components/grapple-solution-framework/application.yaml index 38893a2..9406405 100644 --- a/grapple-solution-framework/components/grapple-solution-framework/application.yaml +++ b/grapple-solution-framework/components/grapple-solution-framework/application.yaml @@ -4,6 +4,11 @@ kind: Application metadata: name: -grapple-solution-framework namespace: argocd + annotations: + kubefirst.konstruct.io/application-name: grapple-solution-framework + kubefirst.konstruct.io/source: catalog-templates + finalizers: + - resources-finalizer.argocd.argoproj.io spec: project: source: diff --git a/index.yaml b/index.yaml index c13d2d6..58c039b 100644 --- a/index.yaml +++ b/index.yaml @@ -234,30 +234,6 @@ apps: description: "The open source Firebase alternative." category: Database - - name: testkube - displayName: Testkube - website: "https://github.com/kubeshop/testkube" - imageUrl: "https://raw.githubusercontent.com/konstructio/gitops-catalog/main/logos/testkube.svg" - description: "Testkube is a Kubernetes-native testing framework that allows you to automate the executions of your existing testing tools inside your Kubernetes cluster." - category: Testing - secretKeys: - - name: API_KEY - label: Testkube API Key - env: TESTKUBE_APP_KEY - - name: ORG_ID - label: Testkube Org ID - env: TESTKUBE_ORG_ID - - name: ENV_ID - label: Testkube Environment ID - env: TESTKUBE_ENV_ID - - - name: tracetest - displayName: Tracetest - website: "https://github.com/kubeshop/tracetest" - imageUrl: "https://raw.githubusercontent.com/konstructio/gitops-catalog/main/logos/tracetest.svg" - description: "Tracetest uses your existing OpenTelemetry traces to power trace-based testing with assertions against your trace data at every point of the request transaction." - category: Testing - - name: typesense displayName: TypeSense website: "https://github.com/typesense/typesense" From 17ca36b6276cbc0d6966605cb5394d89e903f3cf Mon Sep 17 00:00:00 2001 From: John Dietz Date: Wed, 10 Sep 2025 13:42:15 -0400 Subject: [PATCH 2/2] remove kubeshop apps from catalog --- logos/testkube.svg | 13 --- logos/tracetest.svg | 82 ------------------- testkube/components/testkube/application.yaml | 36 -------- .../components/testkube/external-secret.yaml | 16 ---- testkube/testkube.yaml | 25 ------ .../components/tracetest/application.yaml | 30 ------- tracetest/tracetest.yaml | 25 ------ 7 files changed, 227 deletions(-) delete mode 100644 logos/testkube.svg delete mode 100644 logos/tracetest.svg delete mode 100644 testkube/components/testkube/application.yaml delete mode 100644 testkube/components/testkube/external-secret.yaml delete mode 100644 testkube/testkube.yaml delete mode 100644 tracetest/components/tracetest/application.yaml delete mode 100644 tracetest/tracetest.yaml diff --git a/logos/testkube.svg b/logos/testkube.svg deleted file mode 100644 index 2e6f58f..0000000 --- a/logos/testkube.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/logos/tracetest.svg b/logos/tracetest.svg deleted file mode 100644 index 07f98a2..0000000 --- a/logos/tracetest.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/testkube/components/testkube/application.yaml b/testkube/components/testkube/application.yaml deleted file mode 100644 index cd7c8a4..0000000 --- a/testkube/components/testkube/application.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: -testkube - namespace: argocd - annotations: - kubefirst.konstruct.io/application-name: testkube - kubefirst.konstruct.io/source: catalog-templates - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: testkube - name: - project: - source: - chart: testkube - repoURL: https://kubeshop.github.io/helm-charts - targetRevision: 1.11.214 - helm: - releaseName: testkube - values: | - testkube-api.minio.enabled: false - mongodb.enabled: false - testkube-dashboard.enabled: false - testkube-api.cloud.existingSecret.name: -testkube-secret - testkube-api.cloud.existingSecret.key: API_KEY - testkube-api.cloud.existingSecret.orgId: ORG_ID - testkube-api.cloud.existingSecret.envId: ENV_ID - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - CreateNamespace=true diff --git a/testkube/components/testkube/external-secret.yaml b/testkube/components/testkube/external-secret.yaml deleted file mode 100644 index 44f220b..0000000 --- a/testkube/components/testkube/external-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: -testkube-secret - namespace: testkube -spec: - target: - name: testkube - secretStoreRef: - kind: ClusterSecretStore - name: vault-kv-secret - refreshInterval: 10s - dataFrom: - - extract: - key: /testkube diff --git a/testkube/testkube.yaml b/testkube/testkube.yaml deleted file mode 100644 index 80f7d72..0000000 --- a/testkube/testkube.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: -testkube-components - namespace: argocd - annotations: - argocd.argoproj.io/sync-wave: '100' - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: default - source: - repoURL: - path: /components/testkube - targetRevision: HEAD - destination: - name: in-cluster - namespace: testkube - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - CreateNamespace=true diff --git a/tracetest/components/tracetest/application.yaml b/tracetest/components/tracetest/application.yaml deleted file mode 100644 index c3f1125..0000000 --- a/tracetest/components/tracetest/application.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: -tracetest - namespace: argocd - annotations: - kubefirst.konstruct.io/application-name: tracetest - kubefirst.konstruct.io/source: catalog-templates - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - destination: - namespace: tracetest - name: - project: - source: - chart: tracetest - repoURL: https://kubeshop.github.io/helm-charts - targetRevision: 0.2.55 - helm: - releaseName: tracetest - # values: | - # example: value - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - CreateNamespace=true diff --git a/tracetest/tracetest.yaml b/tracetest/tracetest.yaml deleted file mode 100644 index 34a7f2f..0000000 --- a/tracetest/tracetest.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: -tracetest-components - namespace: argocd - annotations: - argocd.argoproj.io/sync-wave: '100' - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: default - source: - repoURL: - path: /components/tracetest - targetRevision: HEAD - destination: - name: in-cluster - namespace: tracetest - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - CreateNamespace=true