diff --git a/argo1/Chart.lock b/argo1/Chart.lock index ce8a73d..c527d22 100644 --- a/argo1/Chart.lock +++ b/argo1/Chart.lock @@ -2,8 +2,5 @@ dependencies: - name: argo-cd repository: https://argoproj.github.io/argo-helm version: 5.29.1 -- name: argocd-apps - repository: https://argoproj.github.io/argo-helm - version: 0.0.9 -digest: sha256:61b3270da67eb8bc6986a8cda0b41b3319dbb07df1295d0ca8cfb5cd31ccc837 -generated: "2023-04-22T13:16:58.406086-05:00" +digest: sha256:bc009287f8e46edcddb1d36d4e6865080d92e97b6572ae2fd4d553d5e41cd2a2 +generated: "2023-04-23T13:13:41.338263-05:00" diff --git a/argo1/argo1 b/argo1/argo1 deleted file mode 160000 index b6fe7dc..0000000 --- a/argo1/argo1 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b6fe7dcf5c3104cec26db52bde711a4537d58bb8 diff --git a/argo1/blah.yaml b/argo1/blah.yaml deleted file mode 100644 index 8ae76ec..0000000 --- a/argo1/blah.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: concourse - namespace: argocd -spec: - project: default - source: - repoURL: 'https://concourse-charts.storage.googleapis.com/' - targetRevision: 17.1.1 - helm: - values: |- - clusterName: Concourse - secrets: - create: true - chart: concourse - destination: - namespace: concourse - name: in-cluster diff --git a/argo1/charts/argo-cd-5.29.1.tgz b/argo1/charts/argo-cd-5.29.1.tgz deleted file mode 100644 index ce12a8a..0000000 Binary files a/argo1/charts/argo-cd-5.29.1.tgz and /dev/null differ diff --git a/argo1/infra-local.yaml b/argo1/infra-local.yaml deleted file mode 100644 index 7a65b31..0000000 --- a/argo1/infra-local.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: local-git-argo1 - namespace: argocd - labels: - argocd.argoproj.io/secret-type: repository -stringData: - type: git - url: https://git.strudelline.net/infra/argocd - project: default diff --git a/argo1/infra.yaml b/argo1/infra.yaml deleted file mode 100644 index 876e5c1..0000000 --- a/argo1/infra.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: local-git-argo1 - namespace: argocd - labels: - argocd.argoproj.io/secret-type: repository -stringData: - type: git - url: git@github.com/jamesandariese/argo1 - project: default - sshPrivateKey: | - -----BEGIN OPENSSH PRIVATE KEY----- - b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW - QyNTUxOQAAACCzR5/gYPwL+YJw+N6Tip03tLH3257Ysc3TJqfymV7PpwAAALAezw3sHs8N - 7AAAAAtzc2gtZWQyNTUxOQAAACCzR5/gYPwL+YJw+N6Tip03tLH3257Ysc3TJqfymV7Ppw - AAAEBohw71h5SaZ6zd3c7MSUUNlWoI40LK+D8wxk1BcCeUybNHn+Bg/Av5gnD43pOKnTe0 - sffbntixzdMmp/KZXs+nAAAAKGphbWVzQEphbWVzcy1NQlAuY2FzY2FkZS5zdHJ1ZGVsbG - luZS5uZXQBAgMEBQ== - -----END OPENSSH PRIVATE KEY----- diff --git a/argo1/poop/_helpers.tpl b/argo1/poop/_helpers.tpl deleted file mode 100644 index 101ad8a..0000000 --- a/argo1/poop/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "argo1.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "argo1.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "argo1.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "argo1.labels" -}} -helm.sh/chart: {{ include "argo1.chart" . }} -{{ include "argo1.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "argo1.selectorLabels" -}} -app.kubernetes.io/name: {{ include "argo1.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "argo1.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "argo1.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/argo1/poop/argocd.yaml b/argo1/poop/argocd.yaml deleted file mode 100644 index 960ec40..0000000 --- a/argo1/poop/argocd.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: "{{ .Release.Name }}" - namespace: "{{ .Release.Namespace }}" -spec: - project: default - source: - repoURL: "{{ .Chart.dependencies[0].repository }}" - targetRevision: "{{ .Chart.dependencies[0].version }}" - chart: "{{ .Chart.dependencies[0].name }}" - helm: - values: | - {{ .Values.argocd.values | nindent 12 }} - destination: - namespace: "{{ .Values.argocd.namespace }}" - name: in-cluster diff --git a/argo1/poop/sshkey b/argo1/poop/sshkey deleted file mode 100644 index 01784e1..0000000 --- a/argo1/poop/sshkey +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW -QyNTUxOQAAACCzR5/gYPwL+YJw+N6Tip03tLH3257Ysc3TJqfymV7PpwAAALAezw3sHs8N -7AAAAAtzc2gtZWQyNTUxOQAAACCzR5/gYPwL+YJw+N6Tip03tLH3257Ysc3TJqfymV7Ppw -AAAEBohw71h5SaZ6zd3c7MSUUNlWoI40LK+D8wxk1BcCeUybNHn+Bg/Av5gnD43pOKnTe0 -sffbntixzdMmp/KZXs+nAAAAKGphbWVzQEphbWVzcy1NQlAuY2FzY2FkZS5zdHJ1ZGVsbG -luZS5uZXQBAgMEBQ== ------END OPENSSH PRIVATE KEY----- diff --git a/argo1/poop/sshkey.pub b/argo1/poop/sshkey.pub deleted file mode 100644 index 4f31434..0000000 --- a/argo1/poop/sshkey.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNHn+Bg/Av5gnD43pOKnTe0sffbntixzdMmp/KZXs+n james@Jamess-MBP.cascade.strudelline.net diff --git a/argo1/templates.back/argocd.yaml b/argo1/templates.back/argocd.yaml deleted file mode 100644 index 6cb93f1..0000000 --- a/argo1/templates.back/argocd.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: "{{ .Release.Name }}" - namespace: "{{ .Release.Namespace }}" -spec: - project: default - source: - repoURL: "{{ (index .Chart.Dependencies 0).Repository }}" - targetRevision: "{{ (index .Chart.Dependencies 0).Version }}" - chart: "{{ (index .Chart.Dependencies 0).Name }}" - helm: - values: | - {{ (index .Values "argo-cd") | toYaml | nindent 12 }} - destination: - namespace: "{{ .Release.Namespace }}" - name: in-cluster diff --git a/argo1/x.yaml b/argo1/x.yaml deleted file mode 100644 index c03d268..0000000 --- a/argo1/x.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - annotations: - meta.helm.sh/release-name: argo1 - meta.helm.sh/release-namespace: argocd - labels: - app.kubernetes.io/managed-by: Helm - name: argo1 - namespace: argocd -spec: - destination: - namespace: argocd - server: https://kubernetes.default.svc - project: default - source: - path: . - repoURL: https://git.strudelline.net/infra/repo1 - targetRevision: HEAD