diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml index c53ba68..cdee092 100644 --- a/badhouseplants/helmfile.yaml +++ b/badhouseplants/helmfile.yaml @@ -6,6 +6,11 @@ releases: installed: true namespace: drone-service createNamespace: false + + - <<: *drone-runner-kube + installed: true + namespace: drone-service + createNamespace: false bases: - ../environments.yaml diff --git a/badhouseplants/values/secrets.drone-runner-kube.yaml b/badhouseplants/values/secrets.drone-runner-kube.yaml new file mode 100644 index 0000000..67c1c78 --- /dev/null +++ b/badhouseplants/values/secrets.drone-runner-kube.yaml @@ -0,0 +1,22 @@ +env: + DRONE_SECRET_PLUGIN_TOKEN: ENC[AES256_GCM,data:6vsbRkd6DbWKf6qPPtfmv14cvKc=,iv:PPlH4m+SyMNNo/bV5/hpW2CZPGwxNKwO3RzY5RPOu5w=,tag:BGEf82OvMjDQvKe078/Fkg==,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-02-19T11:56:50Z" + mac: ENC[AES256_GCM,data:5U/D1hI+3zulh0UuuBv/oGAU8Bz5hpWvLCxUSCQbPSOW08S2jBiyDEdDJH7g0/y1xQkd3xJYLzJ7ccWx98j+0QJ+HOzcUF1Hwro6Zl0GSw8D4xvIeulHwwM6MBJGtOanbSHjeJ6Qyqf/tM5bF9GXpDblrNOXrnhvGOHj2GkzstU=,iv:AWAn3hAUEs8mbproV0M5EJyKddfNmUrI0ouIjvh1fEE=,tag:bFIQa/v4CaDx4RAJ7aHjeg==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.7.3 diff --git a/badhouseplants/values/values.drone-runner-kube.yaml b/badhouseplants/values/values.drone-runner-kube.yaml new file mode 100644 index 0000000..2589a1c --- /dev/null +++ b/badhouseplants/values/values.drone-runner-kube.yaml @@ -0,0 +1,13 @@ +--- +env: + DRONE_RPC_SECRET: drone-rpc-sec + DRONE_RPC_HOST: drone.badhouseplants.net + DRONE_RPC_PROTO: https + DRONE_NAMESPACE_DEFAULT: drone-service + DRONE_RESOURCE_LIMIT_CPU: 300 + DRONE_RESOURCE_REQUEST_CPU: 100 + DRONE_RESOURCE_LIMIT_MEMORY: 2048Mi + DRONE_RESOURCE_REQUEST_MEMORY: 512Mi +rbac: + buildNamespaces: + - drone-service \ No newline at end of file diff --git a/releases.yaml b/releases.yaml index d740c8a..4d17d80 100644 --- a/releases.yaml +++ b/releases.yaml @@ -20,6 +20,12 @@ templates: args: - -c - "helm show crds {{ .Release.Chart }} --version {{ .Release.Version }} | kubectl delete -f -" + default-env-values: + values: + - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml" + default-env-secrets: + secrets: + - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/secrets.{{ .Release.Name }}.yaml" # ---------------------------- # -- Releases # ---------------------------- @@ -54,18 +60,16 @@ templates: istio-gateway: &istio-gateway name: istio-gateway chart: istio/gateway - values: - - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml" inherit: - template: istio-version + - template: default-env-values istiod: &istiod name: istiod chart: istio/istiod - values: - - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml" inherit: - template: istio-version + - template: default-env-values # ---------------------------- # -- Applications @@ -74,16 +78,23 @@ templates: name: openvpn chart: allanger-charts/openvpn version: 1.0.1 - values: - - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml" + inherit: + - template: default-env-values drone: &drone name: drone chart: drone/drone version: 0.6.4 - values: - - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml" - secrets: - - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/secrets.{{ .Release.Name }}.yaml" + inherit: + - template: default-env-values + - template: default-env-secrets + + drone-runner-kube: &drone-runner-kube + name: drone-runner-kube + chart: drone/drone-runner-kube + version: 0.1.10 + inherit: + - template: default-env-values + - template: default-env-secrets