diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml index 79434f9..8572e51 100644 --- a/badhouseplants/helmfile.yaml +++ b/badhouseplants/helmfile.yaml @@ -6,7 +6,12 @@ releases: installed: true namespace: drone-service createNamespace: false - + + - <<: *drone-runner-docker + installed: true + namespace: drone-service + createNamespace: false + - <<: *longhorn installed: true namespace: longhorn-system diff --git a/etersoft/values/secrets.drone-runner-docker.yaml b/etersoft/values/secrets.drone-runner-docker.yaml deleted file mode 100644 index eb18677..0000000 --- a/etersoft/values/secrets.drone-runner-docker.yaml +++ /dev/null @@ -1,22 +0,0 @@ -env: - DRONE_RPC_SECRET: ENC[AES256_GCM,data:RAZbnTrv9PxiCLLqjKWBtFWd+Nzqma8Zw+NuKRLO,iv:IiFcTQGUmYa6UCBzx1yTDd0zwB6D1Cv0raXZxLXm1qA=,tag:83bnBW+MhkKehZfso3g+/g==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age1vzkv97n2p7gfkw8dyx8ctz2kumattz89th2jq47zyjyrarmnssysdkw9v8 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOVk0yaTlySHpuOWFFT3J5 - Z210NzJPTmV0akdFQ1REM1JzK0pwTC9XWjJJCm54QmQ3ODJwakZuamMzYTBIeEJi - aUxKNmQ3dU52V2N2cjl5VTJpTTAwWGsKLS0tIDFyR2o2VnQ4QWFCWWRzZGNMZnNQ - em1VMlhBNGRrVFhXVUVRdU16Q1Q4bUEKvZ6UbZsfdvfCk37FlEN4vg0RTnPO2nwh - DY4klzcan+9DBRT2qdIIy6pj94GuSoXKXEYc9X0AvYab/HoLithMWA== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-05-21T09:27:21Z" - mac: ENC[AES256_GCM,data:U2JETtW0lbb2znJBupGMPsab13y5M1v1N0wkFxEBs+YVNFhnkvIqSZiY5mq9KTYiY4tRzw1kV+jqP0jNsODekCI1++4NBuQsGSZFUoTERHgTRlnz1aAS+nf39lvYnWyQxsQmw9vY/GQ/yluBJkOEV/EoIF3wHjxZe1HCBIViPyk=,iv:WMj7aSgW8LdNQbOgC4FcyOtR/3gjckiHO8vlZGdiTeY=,tag:Xty2QVLJ/D2dlzQY13od5w==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/etersoft/values/values.drone-runner-docker.yaml b/etersoft/values/values.drone-runner-docker.yaml deleted file mode 100644 index 923e72d..0000000 --- a/etersoft/values/values.drone-runner-docker.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -env: - DRONE_RPC_HOST: drone.badhouseplants.net - DRONE_RPC_PROTO: https - DRONE_NAMESPACE_DEFAULT: drone-service -rbac: - buildNamespaces: - - drone-service -dind: - resources: - limits: - cpu: 2000m - memory: 2024Mi - requests: - cpu: 100m - memory: 512Mi \ No newline at end of file diff --git a/helmfile.yaml b/helmfile.yaml index 8a8ccd9..738d891 100644 --- a/helmfile.yaml +++ b/helmfile.yaml @@ -46,11 +46,5 @@ releases: namespace: metallb-system createNamespace: true - - <<: *drone-runner-docker - installed: true - namespace: drone-service - createNamespace: false - - helmfiles: - path: {{.Environment.Name }}/helmfile.yaml