From 9bb0063f8bd7608a811eeedef3a1d0d9748c55bc Mon Sep 17 00:00:00 2001 From: richardrobertreitz Date: Tue, 22 Apr 2025 12:29:50 +0000 Subject: [PATCH 1/2] Use Redis in the Forgejo configuration to support rolling updates of Forgejo itself Forgejo is not able to be reconfigured by default: a queue is locked To circumvent the problem, we need simply to enable the use of Redis as a Forgejo component --- template/stacks/core/forgejo/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/stacks/core/forgejo/values.yaml b/template/stacks/core/forgejo/values.yaml index 90b01a6..b98bbf3 100644 --- a/template/stacks/core/forgejo/values.yaml +++ b/template/stacks/core/forgejo/values.yaml @@ -1,5 +1,5 @@ redis-cluster: - enabled: false + enabled: true postgresql: enabled: false postgresql-ha: From 4eb6fa0908488f9e1c2a01cbc4556cdb30d05606 Mon Sep 17 00:00:00 2001 From: Bot Date: Tue, 22 Apr 2025 18:56:30 +0200 Subject: [PATCH 2/2] Removed unused ArgoCD Application manifests of Crossplane --- .../stacks/core/crossplane-compositions.yaml | 23 -------------- .../edfbuilder/definition.yaml | 30 ------------------- .../stacks/core/crossplane-providers.yaml | 23 -------------- .../function-patch-and-transform.yaml | 9 ------ .../provider-argocd-config.yaml | 14 --------- .../provider-kind-config.yaml | 14 --------- template/stacks/core/crossplane.yaml | 23 -------------- 7 files changed, 136 deletions(-) delete mode 100644 template/stacks/core/crossplane-compositions.yaml delete mode 100644 template/stacks/core/crossplane-compositions/edfbuilder/definition.yaml delete mode 100644 template/stacks/core/crossplane-providers.yaml delete mode 100644 template/stacks/core/crossplane-providers/function-patch-and-transform.yaml delete mode 100644 template/stacks/core/crossplane-providers/provider-argocd-config.yaml delete mode 100644 template/stacks/core/crossplane-providers/provider-kind-config.yaml delete mode 100644 template/stacks/core/crossplane.yaml diff --git a/template/stacks/core/crossplane-compositions.yaml b/template/stacks/core/crossplane-compositions.yaml deleted file mode 100644 index d5341c8..0000000 --- a/template/stacks/core/crossplane-compositions.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: crossplane-compositions - namespace: argocd - labels: - env: dev -spec: - project: default - syncPolicy: - automated: - selfHeal: true - syncOptions: - - CreateNamespace=true - destination: - name: in-cluster - namespace: crossplane-system - source: - path: stacks/core/crossplane-compositions - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder - targetRevision: HEAD - directory: - recurse: true diff --git a/template/stacks/core/crossplane-compositions/edfbuilder/definition.yaml b/template/stacks/core/crossplane-compositions/edfbuilder/definition.yaml deleted file mode 100644 index d8e3e9d..0000000 --- a/template/stacks/core/crossplane-compositions/edfbuilder/definition.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: CompositeResourceDefinition -metadata: - name: edfbuilders.edfbuilder.crossplane.io -spec: - connectionSecretKeys: - - kubeconfig - group: edfbuilder.crossplane.io - names: - kind: EDFBuilder - listKind: EDFBuilderList - plural: edfbuilders - singular: edfbuilders - versions: - - name: v1alpha1 - served: true - referenceable: true - schema: - openAPIV3Schema: - description: A EDFBuilder is a composite resource that represents a K8S Cluster with edfbuilder Installed - type: object - properties: - spec: - type: object - properties: - repoURL: - type: string - description: URL to ArgoCD stack of stacks repo - required: - - repoURL diff --git a/template/stacks/core/crossplane-providers.yaml b/template/stacks/core/crossplane-providers.yaml deleted file mode 100644 index 3fd69b7..0000000 --- a/template/stacks/core/crossplane-providers.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{{ if eq .Env.CLUSTER_TYPE "kind" }}} -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: crossplane-providers - namespace: argocd - labels: - env: dev -spec: - project: default - syncPolicy: - automated: - selfHeal: true - syncOptions: - - CreateNamespace=true - destination: - name: in-cluster - namespace: crossplane-system - source: - path: stacks/core/crossplane-providers - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder - targetRevision: HEAD -{{{ end }}} diff --git a/template/stacks/core/crossplane-providers/function-patch-and-transform.yaml b/template/stacks/core/crossplane-providers/function-patch-and-transform.yaml deleted file mode 100644 index 9a16bba..0000000 --- a/template/stacks/core/crossplane-providers/function-patch-and-transform.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: pkg.crossplane.io/v1 -kind: Function -metadata: - name: crossplane-contrib-function-patch-and-transform -spec: - package: xpkg.upbound.io/crossplane-contrib/function-patch-and-transform:v0.7.0 - packagePullPolicy: IfNotPresent # Only download the package if it isn’t in the cache. - revisionActivationPolicy: Automatic # Otherwise our Provider never gets activate & healthy - revisionHistoryLimit: 1 \ No newline at end of file diff --git a/template/stacks/core/crossplane-providers/provider-argocd-config.yaml b/template/stacks/core/crossplane-providers/provider-argocd-config.yaml deleted file mode 100644 index dba4aad..0000000 --- a/template/stacks/core/crossplane-providers/provider-argocd-config.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argocd.crossplane.io/v1alpha1 -kind: ProviderConfig -metadata: - name: argocd-provider -spec: - serverAddr: argocd-server.argocd.svc.cluster.local:80 - insecure: true - plainText: true - credentials: - source: Secret - secretRef: - namespace: crossplane-system - name: argocd-credentials - key: authToken diff --git a/template/stacks/core/crossplane-providers/provider-kind-config.yaml b/template/stacks/core/crossplane-providers/provider-kind-config.yaml deleted file mode 100644 index edc8dcb..0000000 --- a/template/stacks/core/crossplane-providers/provider-kind-config.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kind.crossplane.io/v1alpha1 -kind: ProviderConfig -metadata: - name: kind-provider -spec: - credentials: - source: Secret - secretRef: - namespace: crossplane-system - name: kind-credentials - key: credentials - endpoint: - # the url is managed by crossplane-edfbuilder - url: https://DOCKER_HOST:SERVER_PORT/api/v1/kindserver diff --git a/template/stacks/core/crossplane.yaml b/template/stacks/core/crossplane.yaml deleted file mode 100644 index 4b6f2af..0000000 --- a/template/stacks/core/crossplane.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: crossplane - namespace: argocd - labels: - env: dev -spec: - project: default - syncPolicy: - automated: - selfHeal: true - syncOptions: - - CreateNamespace=true - destination: - name: in-cluster - namespace: crossplane-system - source: - chart: crossplane - repoURL: https://charts.crossplane.io/stable - targetRevision: 1.18.0 - helm: - releaseName: crossplane