From d6cf85135c79999e7352272a972a44ba6a10a768 Mon Sep 17 00:00:00 2001 From: DeveloperDurp Date: Sun, 14 Dec 2025 07:02:44 -0600 Subject: [PATCH] update --- infra/argocd/templates/octopusdeploy.yaml | 43 ------- infra/argocd/templates/portainer.yaml | 20 ++++ infra/octopus-agent/Chart.yaml | 12 -- infra/octopus-agent/templates/secret.yaml | 23 ---- infra/octopus-agent/values.yaml | 19 ---- infra/octopusdeploy/templates/ingress.yaml | 32 ------ infra/octopusdeploy/templates/secrets.yaml | 106 ------------------ infra/octopusdeploy/values.yaml | 10 -- infra/{octopusdeploy => portainer}/Chart.yaml | 8 +- infra/portainer/values.yaml | 78 +++++++++++++ 10 files changed, 102 insertions(+), 249 deletions(-) delete mode 100644 infra/argocd/templates/octopusdeploy.yaml create mode 100644 infra/argocd/templates/portainer.yaml delete mode 100644 infra/octopus-agent/Chart.yaml delete mode 100644 infra/octopus-agent/templates/secret.yaml delete mode 100644 infra/octopus-agent/values.yaml delete mode 100644 infra/octopusdeploy/templates/ingress.yaml delete mode 100644 infra/octopusdeploy/templates/secrets.yaml delete mode 100644 infra/octopusdeploy/values.yaml rename infra/{octopusdeploy => portainer}/Chart.yaml (52%) create mode 100644 infra/portainer/values.yaml diff --git a/infra/argocd/templates/octopusdeploy.yaml b/infra/argocd/templates/octopusdeploy.yaml deleted file mode 100644 index d58d1fd..0000000 --- a/infra/argocd/templates/octopusdeploy.yaml +++ /dev/null @@ -1,43 +0,0 @@ -#apiVersion: argoproj.io/v1alpha1 -#kind: Application -#metadata: -# name: octopusdeploy -# namespace: argocd -#spec: -# project: default -# source: -# repoURL: https://gitlab.com/developerdurp/homelab.git -# targetRevision: main -# path: infra/octopusdeploy -# destination: -# namespace: octopusdeploy -# name: in-cluster -# syncPolicy: -# automated: -# prune: true -# selfHeal: true -# syncOptions: -# - CreateNamespace=true -# -#--- -#apiVersion: argoproj.io/v1alpha1 -#kind: Application -#metadata: -# name: octopusdeploy-agent -# namespace: argocd -#spec: -# project: default -# source: -# repoURL: https://gitlab.com/developerdurp/homelab.git -# targetRevision: main -# path: infra/octopus-agent -# destination: -# namespace: octopus-agent -# name: in-cluster -# syncPolicy: -# automated: -# prune: true -# selfHeal: true -# syncOptions: -# - CreateNamespace=true -# \ No newline at end of file diff --git a/infra/argocd/templates/portainer.yaml b/infra/argocd/templates/portainer.yaml new file mode 100644 index 0000000..d8b5d32 --- /dev/null +++ b/infra/argocd/templates/portainer.yaml @@ -0,0 +1,20 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: portainer + namespace: argocd +spec: + project: default + source: + repoURL: https://gitlab.com/developerdurp/homelab.git + targetRevision: main + path: infra/portainer + destination: + namespace: portainer + name: in-cluster + syncPolicy: + automated: + prune: true + selfHeal: true + syncOptions: + - CreateNamespace=true diff --git a/infra/octopus-agent/Chart.yaml b/infra/octopus-agent/Chart.yaml deleted file mode 100644 index f36dd2d..0000000 --- a/infra/octopus-agent/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: octopusdeploy -description: A Helm chart for Kubernetes -type: application - -version: 0.1.0 -appVersion: "1.16.0" - -dependencies: - - name: kubernetes-agent - repository: oci://registry-1.docker.io/octopusdeploy - version: 2.*.* diff --git a/infra/octopus-agent/templates/secret.yaml b/infra/octopus-agent/templates/secret.yaml deleted file mode 100644 index 50a87d8..0000000 --- a/infra/octopus-agent/templates/secret.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: vault - ---- - -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: agent-token -spec: - secretStoreRef: - name: vault - kind: ClusterSecretStore - target: - name: agent-token - data: - - secretKey: bearer-token - remoteRef: - key: kv/octopusdeploy - property: infra-bearer-token - diff --git a/infra/octopus-agent/values.yaml b/infra/octopus-agent/values.yaml deleted file mode 100644 index 8f262a5..0000000 --- a/infra/octopus-agent/values.yaml +++ /dev/null @@ -1,19 +0,0 @@ -kubernetes-agent: - agent: - bearerTokenSecretName: agent-token - acceptEula: "Y" - serverUrl: "https://octopus.durp.info/" - serverCommsAddresses: - - "https://octopus-deploy-node0.octopusdeploy.svc.cluster.local:10943/" - - "https://octopus-deploy-node1.octopusdeploy.svc.cluster.local:10943/" - - "https://octopus-deploy-node2.octopusdeploy.svc.cluster.local:10943/" - space: "Default" - name: "infra" - deploymentTarget: - initial: - environments: - - "development" - - "production" - tags: - - "infra-cluster" - enabled: "true" diff --git a/infra/octopusdeploy/templates/ingress.yaml b/infra/octopusdeploy/templates/ingress.yaml deleted file mode 100644 index e399ae8..0000000 --- a/infra/octopusdeploy/templates/ingress.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: octopus-ingress - annotations: - cert-manager.io/cluster-issuer: letsencrypt-production -spec: - entryPoints: - - websecure - routes: - - match: Host(`octopus.durp.info`) && PathPrefix(`/`) - kind: Rule - services: - - name: octopusdeploy-octopus-deploy - port: 80 - tls: - secretName: octopus-tls - ---- - -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: octopus-tls -spec: - secretName: octopus-tls - issuerRef: - name: vault-issuer - kind: ClusterIssuer - commonName: "octopus.durp.info" - dnsNames: - - "octopus.durp.info" diff --git a/infra/octopusdeploy/templates/secrets.yaml b/infra/octopusdeploy/templates/secrets.yaml deleted file mode 100644 index 7f9ec8b..0000000 --- a/infra/octopusdeploy/templates/secrets.yaml +++ /dev/null @@ -1,106 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: vault - ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: octopusdeploy-adminpassword -spec: - secretStoreRef: - name: vault - kind: ClusterSecretStore - target: - name: octopusdeploy-adminpassword - data: - - secretKey: secret - remoteRef: - key: kv/octopusdeploy - property: adminpassword - ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: octopusdeploy-adminusername -spec: - secretStoreRef: - name: vault - kind: ClusterSecretStore - target: - name: octopusdeploy-adminusername - data: - - secretKey: secret - remoteRef: - key: kv/octopusdeploy - property: adminusername - ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: octopusdeploy-connectionstring -spec: - secretStoreRef: - name: vault - kind: ClusterSecretStore - target: - name: octopusdeploy-connectionstring - data: - - secretKey: secret - remoteRef: - key: kv/octopusdeploy - property: connectionstring - ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: octopusdeploy-masterkey -spec: - secretStoreRef: - name: vault - kind: ClusterSecretStore - target: - name: octopusdeploy-masterkey - data: - - secretKey: secret - remoteRef: - key: kv/octopusdeploy - property: masterkey - ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: octopusdeploy-sapassword -spec: - secretStoreRef: - name: vault - kind: ClusterSecretStore - target: - name: octopusdeploy-sapassword - data: - - secretKey: secret - remoteRef: - key: kv/octopusdeploy - property: sapassword - ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: octopusdeploy-licensekey -spec: - secretStoreRef: - name: vault - kind: ClusterSecretStore - target: - name: octopusdeploy-licensekey - data: - - secretKey: secret - remoteRef: - key: kv/octopusdeploy - property: licensekey diff --git a/infra/octopusdeploy/values.yaml b/infra/octopusdeploy/values.yaml deleted file mode 100644 index 70db7fa..0000000 --- a/infra/octopusdeploy/values.yaml +++ /dev/null @@ -1,10 +0,0 @@ -octopusdeploy-helm: - octopus: - image: - repository: registry.durp.info/octopusdeploy/octopusdeploy - tag: 2025.3 - createSecrets: false - acceptEula: Y - replicaCount: 3 - mssql: - enabled: true \ No newline at end of file diff --git a/infra/octopusdeploy/Chart.yaml b/infra/portainer/Chart.yaml similarity index 52% rename from infra/octopusdeploy/Chart.yaml rename to infra/portainer/Chart.yaml index e1aba0c..1813d7a 100644 --- a/infra/octopusdeploy/Chart.yaml +++ b/infra/portainer/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: octopusdeploy +name: portainer description: A Helm chart for Kubernetes type: application @@ -7,6 +7,6 @@ version: 0.1.0 appVersion: "1.16.0" dependencies: - - name: octopusdeploy-helm - repository: oci://ghcr.io/octopusdeploy - version: 1.7.0 + - name: portainer + repository: https://portainer.github.io/k8s/ + version: 2.33.5 diff --git a/infra/portainer/values.yaml b/infra/portainer/values.yaml new file mode 100644 index 0000000..a63ba2e --- /dev/null +++ b/infra/portainer/values.yaml @@ -0,0 +1,78 @@ +portainer: + replicaCount: 1 + image: + repository: registry.durp.info/portainer/portainer-ce + tag: 2.33.5 + pullPolicy: Always + + imagePullSecrets: [] + + nodeSelector: {} + tolerations: [] + + serviceAccount: + annotations: {} + name: portainer-sa-clusteradmin + + # This flag provides the ability to enable or disable RBAC-related resources during the deployment of the Portainer application + # If you are using Portainer to manage the K8s cluster it is deployed to, this flag must be set to true + localMgmt: true + + service: + # Set the httpNodePort and edgeNodePort only if the type is NodePort + # For Ingress, set the type to be ClusterIP and set ingress.enabled to true + # For Cloud Providers, set the type to be LoadBalancer + type: NodePort + httpPort: 9000 + httpsPort: 9443 + httpNodePort: 30777 + httpsNodePort: 30779 + edgePort: 8000 + edgeNodePort: 30776 + annotations: {} + + tls: + # If set, Portainer will be configured to use TLS only + force: false + # If set, will mount the existing secret into the pod + existingSecret: "" + + trusted_origins: + # If set, Portainer will be configured to trust the domains specified in domains + enabled: false + # specify (in a comma-separated list) the domain(s) used to access Portainer when it is behind a reverse proxy + # example: portainer.mydomain.com,portainer.example.com + domains: "" + + mtls: + # If set, Portainer will be configured to use mTLS only + enable: false + # If set, will mount the existing secret into the pod + existingSecret: "" + + feature: + flags: [] + + ingress: + enabled: false + ingressClassName: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # Only use below if tls.force=true + # nginx.ingress.kubernetes.io/backend-protocol: HTTPS + # Note: Hosts and paths are of type array + hosts: + - host: + paths: [] + # - path: "/" + tls: [] + + resources: {} + + persistence: + enabled: true + size: "10Gi" + annotations: {} + storageClass: longhorn + existingClaim: +