diff --git a/argocd/apps/clusters/Chart.yaml b/argocd/apps/clusters/Chart.yaml deleted file mode 100644 index 5e5ef73..0000000 --- a/argocd/apps/clusters/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: cluster -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "1.16.0" diff --git a/argocd/apps/crossplane/.helmignore b/argocd/apps/crossplane/.helmignore deleted file mode 100644 index 0e8a0eb..0000000 --- a/argocd/apps/crossplane/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/argocd/apps/crossplane/Chart.yaml b/argocd/apps/crossplane/Chart.yaml deleted file mode 100644 index a7fe41f..0000000 --- a/argocd/apps/crossplane/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: crossplane-apps -description: A Helm chart for creating crossplane apps - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "1.16.0" diff --git a/argocd/apps/crossplane/templates/provider-configs/aws-provider-configs/provider-config.yaml b/argocd/apps/crossplane/templates/provider-configs/aws-provider-configs/provider-config.yaml deleted file mode 100644 index edd95e5..0000000 --- a/argocd/apps/crossplane/templates/provider-configs/aws-provider-configs/provider-config.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: crossplane-aws-provider-config - namespace: argo-cd -spec: - project: default - source: - repoURL: https://github.com/intelops/capten-templates.git - targetRevision: main - path: infra/crossplane/crossplane-config - destination: - server: https://kubernetes.default.svc - namespace: crossplane diff --git a/argocd/apps/tekton/Chart.yaml b/argocd/apps/tekton/Chart.yaml deleted file mode 100644 index 69270c8..0000000 --- a/argocd/apps/tekton/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: tekton-apps -description: A Helm chart for tekton apps - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "1.16.0" diff --git a/argocd/apps/tekton/templates/configs/configs.yaml b/argocd/apps/tekton/templates/configs/configs.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/argocd/apps/tekton/templates/pipelines/pipelines.yaml b/argocd/apps/tekton/templates/pipelines/pipelines.yaml deleted file mode 100644 index 61b5a6d..0000000 --- a/argocd/apps/tekton/templates/pipelines/pipelines.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: tekton-pipeline-dev-cluster - namespace: argo-cd -spec: - project: default - source: - repoURL: https://github.com/intelops/capten-templates.git - targetRevision: main - path: tekton/tekton-pipelines/tekton-yamls - destination: - server: https://kubernetes.default.svc - namespace: tek diff --git a/argocd/apps/tekton/values.yaml b/argocd/apps/tekton/values.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/argocd/main-apps/clusters-main-app.yaml b/argocd/main-apps/clusters-main-app.yaml deleted file mode 100644 index 64aba19..0000000 --- a/argocd/main-apps/clusters-main-app.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: clusters - namespace: argo-cd -spec: - project: default - source: - repoURL: https://github.com/intelops/capten-templates.git - targetRevision: HEAD - path: argocd/apps/clusters - helm: - valueFiles: - - values.yaml - destination: - server: https://kubernetes.default.svc - namespace: tekton-pipelines diff --git a/argocd/main-apps/crossplane-main-app.yaml b/argocd/main-apps/crossplane-main-app.yaml deleted file mode 100644 index cdd2629..0000000 --- a/argocd/main-apps/crossplane-main-app.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: crossplane-apps - namespace: argo-cd -spec: - project: default - source: - repoURL: https://github.com/intelops/capten-templates.git - targetRevision: main - path: argocd/apps/crossplane - helm: - valueFiles: - - values.yaml - destination: - server: https://kubernetes.default.svc - namespace: crossplane diff --git a/argocd/main-apps/tekton-main-app.yaml b/argocd/main-apps/tekton-main-app.yaml deleted file mode 100644 index f977fc4..0000000 --- a/argocd/main-apps/tekton-main-app.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: tekton-apps - namespace: argo-cd -spec: - project: default - source: - repoURL: https://github.com/intelops/capten-templates.git - targetRevision: HEAD - path: argocd/apps/tekton - helm: - valueFiles: - - values.yaml - destination: - server: https://kubernetes.default.svc - namespace: tekton-pipelines diff --git a/argocd/apps/clusters/templates/cluster-configs/aws-k8s-packages.yaml b/infra/clusters/argocd-apps/templates/cluster-compositions/aws-composition.yaml similarity index 78% rename from argocd/apps/clusters/templates/cluster-configs/aws-k8s-packages.yaml rename to infra/clusters/argocd-apps/templates/cluster-compositions/aws-composition.yaml index 2e0c4d3..fe6fca0 100644 --- a/argocd/apps/clusters/templates/cluster-configs/aws-k8s-packages.yaml +++ b/infra/clusters/argocd-apps/templates/cluster-compositions/aws-composition.yaml @@ -8,7 +8,10 @@ spec: source: repoURL: https://github.com/intelops/capten-templates.git targetRevision: main - path: infra/crossplane/packages/k8s + path: infra/clusters/compositions/aws destination: server: https://kubernetes.default.svc namespace: crossplane + syncPolicy: + automated: + prune: true diff --git a/infra/clusters/argocd-apps/templates/cluster-configs/aws-k8s-packages.yaml b/infra/clusters/argocd-apps/templates/cluster-configs/aws-k8s-packages.yaml deleted file mode 100644 index c391db1..0000000 --- a/infra/clusters/argocd-apps/templates/cluster-configs/aws-k8s-packages.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: crossplane-aws-dev-cluster - namespace: argocd -spec: - project: default - source: - repoURL: https://github.com/intelops/capten-templates.git - targetRevision: main - path: infra/crossplane/packages/k8s - destination: - server: https://kubernetes.default.svc - namespace: crossplane diff --git a/infra/clusters/argocd-apps/templates/dev/dev-cluster-apps.yaml b/infra/clusters/argocd-apps/templates/dev/dev-cluster-apps.yaml index b4842a0..8cdf101 100644 --- a/infra/clusters/argocd-apps/templates/dev/dev-cluster-apps.yaml +++ b/infra/clusters/argocd-apps/templates/dev/dev-cluster-apps.yaml @@ -12,3 +12,6 @@ spec: destination: server: https://kubernetes.default.svc namespace: crossplane + syncPolicy: + automated: + prune: true \ No newline at end of file diff --git a/infra/clusters/argocd-apps/templates/dev/dev-cluster.yaml b/infra/clusters/argocd-apps/templates/dev/dev-cluster.yaml index 6b6ff14..21cdaa9 100644 --- a/infra/clusters/argocd-apps/templates/dev/dev-cluster.yaml +++ b/infra/clusters/argocd-apps/templates/dev/dev-cluster.yaml @@ -8,7 +8,10 @@ spec: source: repoURL: https://github.com/intelops/capten-templates.git targetRevision: main - path: infra/crossplane/clusters/dev + path: infra/crossplane/clusters/dev/clusterconfigs destination: server: https://kubernetes.default.svc namespace: crossplane + syncPolicy: + automated: + prune: true diff --git a/infra/crossplane/packages/k8s/eks.yaml b/infra/clusters/compositions/aws/eks.yaml similarity index 100% rename from infra/crossplane/packages/k8s/eks.yaml rename to infra/clusters/compositions/aws/eks.yaml diff --git a/infra/clusters/dev/dev-eks.yaml b/infra/clusters/dev/clusterconfig/dev-eks.yaml similarity index 100% rename from infra/clusters/dev/dev-eks.yaml rename to infra/clusters/dev/clusterconfig/dev-eks.yaml diff --git a/infra/clusters/clusters-main-app.yaml b/infra/clusters/prod/clusterconfig/clusters-main-app.yaml similarity index 89% rename from infra/clusters/clusters-main-app.yaml rename to infra/clusters/prod/clusterconfig/clusters-main-app.yaml index 4bbdba1..93397c1 100644 --- a/infra/clusters/clusters-main-app.yaml +++ b/infra/clusters/prod/clusterconfig/clusters-main-app.yaml @@ -15,3 +15,6 @@ spec: destination: server: https://kubernetes.default.svc namespace: tekton-pipelines + syncPolicy: + automated: + prune: true \ No newline at end of file diff --git a/argocd/apps/clusters/templates/dev/dev-cluster-apps.yaml b/infra/crossplane/argocd-apps/templates/package-k8s/aws-packages/aws-k8s-package.yaml similarity index 80% rename from argocd/apps/clusters/templates/dev/dev-cluster-apps.yaml rename to infra/crossplane/argocd-apps/templates/package-k8s/aws-packages/aws-k8s-package.yaml index b4842a0..44cece6 100644 --- a/argocd/apps/clusters/templates/dev/dev-cluster-apps.yaml +++ b/infra/crossplane/argocd-apps/templates/package-k8s/aws-packages/aws-k8s-package.yaml @@ -1,14 +1,14 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: dev-cluster-base-apps + name: aws-k8s-package namespace: argo-cd spec: project: default source: repoURL: https://github.com/intelops/capten-templates.git targetRevision: main - path: apps + path: infra/crossplane/packages-def/k8s/aws destination: server: https://kubernetes.default.svc namespace: crossplane diff --git a/infra/crossplane/argocd-apps/templates/provider-configs/aws-provider-configs/provider-config.yaml b/infra/crossplane/argocd-apps/templates/provider-configs/aws-provider-configs/provider-config.yaml deleted file mode 100644 index 6ee2f50..0000000 --- a/infra/crossplane/argocd-apps/templates/provider-configs/aws-provider-configs/provider-config.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: crossplane-aws-dev-cluster - namespace: argo-cd -spec: - project: default - source: - repoURL: https://github.com/intelops/capten-templates.git - targetRevision: main - path: infra/crossplane/crossplane-config - destination: - server: https://kubernetes.default.svc - namespace: crossplane diff --git a/argocd/apps/clusters/templates/dev/dev-cluster.yaml b/infra/crossplane/argocd-apps/templates/providers/provider.yaml similarity index 72% rename from argocd/apps/clusters/templates/dev/dev-cluster.yaml rename to infra/crossplane/argocd-apps/templates/providers/provider.yaml index 6b6ff14..d9eef38 100644 --- a/argocd/apps/clusters/templates/dev/dev-cluster.yaml +++ b/infra/crossplane/argocd-apps/templates/providers/provider.yaml @@ -1,14 +1,14 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: crossplane-aws-dev-cluster + name: providers namespace: argo-cd spec: project: default source: repoURL: https://github.com/intelops/capten-templates.git targetRevision: main - path: infra/crossplane/clusters/dev + path: infra/crossplane/providers destination: server: https://kubernetes.default.svc - namespace: crossplane + namespace: crossplane \ No newline at end of file diff --git a/infra/crossplane/crossplane-config/provider.yaml b/infra/crossplane/crossplane-config/provider.yaml deleted file mode 100644 index 3efc62f..0000000 --- a/infra/crossplane/crossplane-config/provider.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: pkg.crossplane.io/v1alpha1 -kind: ControllerConfig -metadata: - name: aws-vault-config -spec: - args: - - --debug - metadata: - annotations: - vault.hashicorp.com/agent-inject: "true" - vault.hashicorp.com/role: "crossplane-providers" - vault.hashicorp.com/agent-inject-secret-creds.txt: "secret/provider-creds/aws-default" - vault.hashicorp.com/agent-inject-template-creds.txt: | - {{- with secret "secret/provider-creds/aws-default" -}} - [default] - aws_access_key_id="{{ .Data.data.access_key }}" - aws_secret_access_key="{{ .Data.data.secret_key }}" - {{- end -}} ---- -apiVersion: pkg.crossplane.io/v1 -kind: Provider -metadata: - name: provider-aws -spec: - package: xpkg.upbound.io/crossplane-contrib/provider-aws:v0.33.0 - controllerConfigRef: - name: aws-vault-config - diff --git a/infra/crossplane/crossplane-config/providerconfig.yaml b/infra/crossplane/crossplane-config/providerconfig.yaml deleted file mode 100644 index 0a6922e..0000000 --- a/infra/crossplane/crossplane-config/providerconfig.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: aws.crossplane.io/v1beta1 -kind: ProviderConfig -metadata: - name: default -spec: - credentials: - source: Filesystem - fs: - path: /vault/secrets/creds.txt diff --git a/argocd/apps/clusters/templates/prod/prod-apps.yaml b/infra/crossplane/crossplane-config/providers-placeholsers.yaml similarity index 100% rename from argocd/apps/clusters/templates/prod/prod-apps.yaml rename to infra/crossplane/crossplane-config/providers-placeholsers.yaml diff --git a/infra/crossplane/packages/k8s/definition.yaml b/infra/crossplane/packages-def/k8s/aws/definition.yaml similarity index 100% rename from infra/crossplane/packages/k8s/definition.yaml rename to infra/crossplane/packages-def/k8s/aws/definition.yaml diff --git a/argocd/apps/clusters/templates/prod/prod-cluster.yaml b/infra/crossplane/packages-def/k8s/aws/providerconfig.yaml similarity index 100% rename from argocd/apps/clusters/templates/prod/prod-cluster.yaml rename to infra/crossplane/packages-def/k8s/aws/providerconfig.yaml diff --git a/argocd/apps/clusters/values.yaml b/infra/crossplane/providers/aws/provider-config.yaml similarity index 100% rename from argocd/apps/clusters/values.yaml rename to infra/crossplane/providers/aws/provider-config.yaml diff --git a/argocd/apps/crossplane/values.yaml b/infra/crossplane/providers/aws/provider.yaml similarity index 100% rename from argocd/apps/crossplane/values.yaml rename to infra/crossplane/providers/aws/provider.yaml diff --git a/infra/crossplane/providers/chart.yaml b/infra/crossplane/providers/chart.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/tekton/tekton-pipelines/terraform/pipeline.yaml b/tekton/tekton-pipelines/terraform/pipeline.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/tekton/tekton-pipelines/terraform/pipelinerun.yaml b/tekton/tekton-pipelines/terraform/pipelinerun.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/tekton/tekton-pipelines/terraform/task.yaml b/tekton/tekton-pipelines/terraform/task.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/tekton/tekton-source/chart.yaml b/tekton/tekton-source/chart.yaml deleted file mode 100644 index e69de29..0000000