diff --git a/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/configurations/names.yaml b/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/configurations/names.yaml deleted file mode 100644 index f1d65122..00000000 --- a/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/configurations/names.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Configure names transformer -nameReference: - - kind: Secret - fieldSpecs: - # Replace secret names in HelmReleases - - group: helm.toolkit.fluxcd.io - kind: HelmRelease - path: spec/valuesFrom/name diff --git a/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/kustomization.yaml b/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/kustomization.yaml index a595b6fa..12c831a2 100644 --- a/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/kustomization.yaml +++ b/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/kustomization.yaml @@ -1,17 +1,7 @@ # Create aster-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following configuration files -configurations: - - configurations/names.yaml # Include the following resources resources: - resources/release.yaml - resources/repository.yaml -# Generate secrets -secretGenerator: - - files: - # It's important to include extension in the key - # SOPS will use it to determine the format of the content - - values.yaml=secrets/values.yaml - name: aster-helm-secrets-values diff --git a/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/resources/release.yaml b/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/resources/release.yaml index fd0200b4..41dee938 100644 --- a/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/resources/release.yaml +++ b/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/resources/release.yaml @@ -18,15 +18,4 @@ spec: postRenderers: [] values: aster: - urls: - public: https://aster.k8s.spietras.dev - scorpion: - public: - scheme: https - host: scorpion.k8s.spietras.dev - port: null debug: false - valuesFrom: - - kind: Secret - name: aster-helm-secrets-values - valuesKey: values.yaml diff --git a/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/secrets/values.yaml b/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/secrets/values.yaml deleted file mode 100644 index 5952b745..00000000 --- a/src/clusters/main/apps/aster/kustomize/aster-helm/kustomize/secrets/values.yaml +++ /dev/null @@ -1,37 +0,0 @@ -aster: - secrets: - auth: - - ENC[AES256_GCM,data:BDoSjV+5,iv:opO1ZFvo6mSPoFZjgOQWHl1+u02CV5gF09u+I7NpYYw=,tag:5FdQPh2d3y1q5k1OGWKauw==,type:str] - scorpion: - public: - client: ENC[AES256_GCM,data:HEbJPTs=,iv:OKsd9ZnxrIhANho7za33OYkPl7mKwnVx/VpNo/xH9VI=,tag:KZX8PG+nfYNsrDGoe2crog==,type:str] - secret: ENC[AES256_GCM,data:JjBPZ/x5,iv:pFVz5MeA56kQayLWk4q7zDxT4Wj2gkvTJroE9tEkx28=,tag:VjhYLxZvT38avcWAUQ3SLg==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age14uepygtepskwehywergh9fe9j2a3ytqd80y9r2ekfmett6rq3peqjtgxns - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGY1ZoYlZvWG04Zk9ZdXh2 - T0VWUk1oY0R0eEtpQnJRcWIzUXozQUlGOVRNCitxY0h5b3l6QnN2ejNZQ3Z1aXJX - aWhuNjZtYVNlTi9vV2pJOXJ3dkpZQjQKLS0tIGtJdFNOaDVtWXQ5aTd5L1diTzhw - c2RmaXczVnY0azVqWEtZTHQ5YUZFYkEK57cPtu0CelzVM9LFR/i3qUbAPt6HRAUZ - jAlPDHIQqQWeJE7x8E3CwCT3Z7LyA3fgSlt8eZ/n1OE6hNc1uWRz4Q== - -----END AGE ENCRYPTED FILE----- - - recipient: age1y5lqafxarcnlrduh8k3tycnaq63v2alagmtkf0k9gd59pg263axqtt928v - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOalFvczJlL2xpUlVEblRD - TGlid0dzRWhxYTBUZENVQzNESGtyTmkvcVFJCmxtWDQyb2VJNUNPaEVJVzVja0RK - aEVOZ2ZsMmZTckduVGRzcHFWSUFJdjAKLS0tIFRHZ3M0dUlob0p6R0JPQlpSWG0x - cm1sN3U1VnZNNTU1NFQ2UlRmSUJiVUkKcDxNEToerq/aAa+m8Bmyg9R+UsuMXwx/ - 1guqoWy3m4ucGQBi7eCswg5m+rGee+FgzlQsan9EQwL8Zhh8sTwlaQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-05T18:23:55Z" - mac: ENC[AES256_GCM,data:I2yfrCpRVNJv3f/NcdWT16zwkjubbzAwBWLT7uLORqPKFgWVeufwV3ovcjzQhhYEhhUa91hfYdZTGpn8v1xGEe0L1K94xSkM9yNDTliHeP8EOdNxsUJjJnSgi7hfAEmj31WIscrZx/6EP2U8tSOZ+Dxh+N0hGhNc7h9TpJsMZxU=,iv:IsKgzfah5XXoAlj6BIWOu5CXEC+rRkjSoUQGD0GK3ys=,tag:rQwAA+hAlT/kFw/mMxyyRw==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.8.1 diff --git a/src/clusters/main/apps/crocus/kustomize/crocus-helm/kustomize/resources/release.yaml b/src/clusters/main/apps/crocus/kustomize/crocus-helm/kustomize/resources/release.yaml index 6559d574..e2104b4b 100644 --- a/src/clusters/main/apps/crocus/kustomize/crocus-helm/kustomize/resources/release.yaml +++ b/src/clusters/main/apps/crocus/kustomize/crocus-helm/kustomize/resources/release.yaml @@ -18,11 +18,12 @@ spec: postRenderers: [] values: crocus: - orchid: - public: - scheme: https + debug: false + urls: + orchid: host: orchid.k8s.spietras.dev port: null + scheme: https valuesFrom: - kind: Secret name: crocus-helm-secrets-values diff --git a/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/configurations/names.yaml b/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/configurations/names.yaml deleted file mode 100644 index f1d65122..00000000 --- a/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/configurations/names.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Configure names transformer -nameReference: - - kind: Secret - fieldSpecs: - # Replace secret names in HelmReleases - - group: helm.toolkit.fluxcd.io - kind: HelmRelease - path: spec/valuesFrom/name diff --git a/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/kustomization.yaml b/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/kustomization.yaml index 7165636c..1d664f6b 100644 --- a/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/kustomization.yaml +++ b/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/kustomization.yaml @@ -1,17 +1,7 @@ # Create daisy-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following configuration files -configurations: - - configurations/names.yaml # Include the following resources resources: - resources/release.yaml - resources/repository.yaml -# Generate secrets -secretGenerator: - - files: - # It's important to include extension in the key - # SOPS will use it to determine the format of the content - - values.yaml=secrets/values.yaml - name: daisy-helm-secrets-values diff --git a/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/resources/release.yaml b/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/resources/release.yaml index 218a0fd5..f0fd9447 100644 --- a/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/resources/release.yaml +++ b/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/resources/release.yaml @@ -18,15 +18,4 @@ spec: postRenderers: [] values: daisy: - urls: - public: https://daisy.k8s.spietras.dev - scorpion: - public: - scheme: https - host: scorpion.k8s.spietras.dev - port: null debug: false - valuesFrom: - - kind: Secret - name: daisy-helm-secrets-values - valuesKey: values.yaml diff --git a/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/secrets/values.yaml b/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/secrets/values.yaml deleted file mode 100644 index fb04ade1..00000000 --- a/src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize/secrets/values.yaml +++ /dev/null @@ -1,37 +0,0 @@ -daisy: - secrets: - auth: - - ENC[AES256_GCM,data:2AoHxWhh,iv:xhAImRxqFvYUDhbB67DK4nfLN9knknHFauZ8tkrYlkY=,tag:YXFhv5jLqcsiRBEHTKJThw==,type:str] - scorpion: - public: - client: ENC[AES256_GCM,data:hr8DIIQ=,iv:+O8po/XTtbh9+KpUI8zzr23Xum7oqGVqOlQoEvW7h70=,tag:D3GkUvFAZUrHEW3mtNJbJQ==,type:str] - secret: ENC[AES256_GCM,data:KAm6plzQ,iv:5FN002IkylvVROS+xsxSSyuySXsUG1SjqKCXNBkKGfQ=,tag:PgvlrOsscsI+93OQPmc/lg==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age14uepygtepskwehywergh9fe9j2a3ytqd80y9r2ekfmett6rq3peqjtgxns - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGY1ZoYlZvWG04Zk9ZdXh2 - T0VWUk1oY0R0eEtpQnJRcWIzUXozQUlGOVRNCitxY0h5b3l6QnN2ejNZQ3Z1aXJX - aWhuNjZtYVNlTi9vV2pJOXJ3dkpZQjQKLS0tIGtJdFNOaDVtWXQ5aTd5L1diTzhw - c2RmaXczVnY0azVqWEtZTHQ5YUZFYkEK57cPtu0CelzVM9LFR/i3qUbAPt6HRAUZ - jAlPDHIQqQWeJE7x8E3CwCT3Z7LyA3fgSlt8eZ/n1OE6hNc1uWRz4Q== - -----END AGE ENCRYPTED FILE----- - - recipient: age1y5lqafxarcnlrduh8k3tycnaq63v2alagmtkf0k9gd59pg263axqtt928v - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOalFvczJlL2xpUlVEblRD - TGlid0dzRWhxYTBUZENVQzNESGtyTmkvcVFJCmxtWDQyb2VJNUNPaEVJVzVja0RK - aEVOZ2ZsMmZTckduVGRzcHFWSUFJdjAKLS0tIFRHZ3M0dUlob0p6R0JPQlpSWG0x - cm1sN3U1VnZNNTU1NFQ2UlRmSUJiVUkKcDxNEToerq/aAa+m8Bmyg9R+UsuMXwx/ - 1guqoWy3m4ucGQBi7eCswg5m+rGee+FgzlQsan9EQwL8Zhh8sTwlaQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-04T21:15:38Z" - mac: ENC[AES256_GCM,data:2JpxdlhQKf6MM383tqY+7zgUyeMFfLGKnXnNcNVNDqHqUAy0UjMoE0lgZ6LKCsdseStDPaZcBIZqAi0/9t71QSO/v6JCXDZas4Hapgl7KQox6vjHqAWC3pGNrsJfWZ4ykuzgE38jor9eJWvRiMc8/8/cMEOuSwbL4VezwL8fhX0=,iv:mnVwrM9ODgnWNbzW4+ekYRlMqaoG5L++mycnAS5RguQ=,tag:porWaO8BELiIjN9Q6GEKsQ==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.8.1 diff --git a/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/configurations/names.yaml b/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/configurations/names.yaml deleted file mode 100644 index f1d65122..00000000 --- a/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/configurations/names.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Configure names transformer -nameReference: - - kind: Secret - fieldSpecs: - # Replace secret names in HelmReleases - - group: helm.toolkit.fluxcd.io - kind: HelmRelease - path: spec/valuesFrom/name diff --git a/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/kustomization.yaml b/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/kustomization.yaml index b01549dd..f1c0ec98 100644 --- a/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/kustomization.yaml +++ b/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/kustomization.yaml @@ -1,17 +1,7 @@ # Create jasmine-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following configuration files -configurations: - - configurations/names.yaml # Include the following resources resources: - resources/release.yaml - resources/repository.yaml -# Generate secrets -secretGenerator: - - files: - # It's important to include extension in the key - # SOPS will use it to determine the format of the content - - values.yaml=secrets/values.yaml - name: jasmine-helm-secrets-values diff --git a/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/resources/release.yaml b/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/resources/release.yaml index 9e6b81fc..5685f6f8 100644 --- a/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/resources/release.yaml +++ b/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/resources/release.yaml @@ -18,15 +18,4 @@ spec: postRenderers: [] values: jasmine: - urls: - public: https://jasmine.k8s.spietras.dev - scorpion: - public: - scheme: https - host: scorpion.k8s.spietras.dev - port: null debug: false - valuesFrom: - - kind: Secret - name: jasmine-helm-secrets-values - valuesKey: values.yaml diff --git a/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/secrets/values.yaml b/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/secrets/values.yaml deleted file mode 100644 index 93cb9e51..00000000 --- a/src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize/secrets/values.yaml +++ /dev/null @@ -1,37 +0,0 @@ -jasmine: - secrets: - auth: - - ENC[AES256_GCM,data:4W/S6zGy,iv:CyF90klWr7PEIW8P114dT5q5702Dsv7OWq82IkM4UbA=,tag:21Y4c+K0TE20Wp2vZIuc+Q==,type:str] - scorpion: - public: - client: ENC[AES256_GCM,data:GHcE6WncSQ==,iv:rUSwWJFVujeV3/wjRyXp+s+f6GuYkGWYOWocRWLm2iY=,tag:/esUolmCx22CegVAC73XmQ==,type:str] - secret: ENC[AES256_GCM,data:xsHQtYtz,iv:dA4QQVOaVFb87RR11sVY3yJVCE4k5oA9M01gB3xvlVs=,tag:XEMy76C30N9obuul5h5eDA==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age14uepygtepskwehywergh9fe9j2a3ytqd80y9r2ekfmett6rq3peqjtgxns - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGY1ZoYlZvWG04Zk9ZdXh2 - T0VWUk1oY0R0eEtpQnJRcWIzUXozQUlGOVRNCitxY0h5b3l6QnN2ejNZQ3Z1aXJX - aWhuNjZtYVNlTi9vV2pJOXJ3dkpZQjQKLS0tIGtJdFNOaDVtWXQ5aTd5L1diTzhw - c2RmaXczVnY0azVqWEtZTHQ5YUZFYkEK57cPtu0CelzVM9LFR/i3qUbAPt6HRAUZ - jAlPDHIQqQWeJE7x8E3CwCT3Z7LyA3fgSlt8eZ/n1OE6hNc1uWRz4Q== - -----END AGE ENCRYPTED FILE----- - - recipient: age1y5lqafxarcnlrduh8k3tycnaq63v2alagmtkf0k9gd59pg263axqtt928v - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOalFvczJlL2xpUlVEblRD - TGlid0dzRWhxYTBUZENVQzNESGtyTmkvcVFJCmxtWDQyb2VJNUNPaEVJVzVja0RK - aEVOZ2ZsMmZTckduVGRzcHFWSUFJdjAKLS0tIFRHZ3M0dUlob0p6R0JPQlpSWG0x - cm1sN3U1VnZNNTU1NFQ2UlRmSUJiVUkKcDxNEToerq/aAa+m8Bmyg9R+UsuMXwx/ - 1guqoWy3m4ucGQBi7eCswg5m+rGee+FgzlQsan9EQwL8Zhh8sTwlaQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-04T23:55:02Z" - mac: ENC[AES256_GCM,data:FKK1M0BrYREtPlM64wQVzKYBCoONzPzvs0idnZUOdleT9KOavfcjbfajaAIGb+l++7DbZk+yapvG+pxbRkJVEQFvHc/mJGL2DvWAjptxsk7QvpFTYBhenlEBnu5MTp2j/7NjB6UNukgYAvVtV1PlkH6dad3RCN99KU5D1pGdenI=,iv:xgbDC/drgEiMNy/r/vj2/qNZ937KrnDnQZJ5JTgXGk4=,tag:Wo/8fHwp3kY9sedXZPJNjg==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.8.1 diff --git a/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/configurations/names.yaml b/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/configurations/names.yaml deleted file mode 100644 index f1d65122..00000000 --- a/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/configurations/names.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Configure names transformer -nameReference: - - kind: Secret - fieldSpecs: - # Replace secret names in HelmReleases - - group: helm.toolkit.fluxcd.io - kind: HelmRelease - path: spec/valuesFrom/name diff --git a/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/kustomization.yaml b/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/kustomization.yaml index 08ed1460..ba888912 100644 --- a/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/kustomization.yaml +++ b/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/kustomization.yaml @@ -1,17 +1,7 @@ # Create lotus-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following configuration files -configurations: - - configurations/names.yaml # Include the following resources resources: - resources/release.yaml - resources/repository.yaml -# Generate secrets -secretGenerator: - - files: - # It's important to include extension in the key - # SOPS will use it to determine the format of the content - - values.yaml=secrets/values.yaml - name: lotus-helm-secrets-values diff --git a/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/resources/release.yaml b/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/resources/release.yaml index e0280ecd..143cc111 100644 --- a/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/resources/release.yaml +++ b/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/resources/release.yaml @@ -18,15 +18,4 @@ spec: postRenderers: [] values: lotus: - urls: - public: https://lotus.k8s.spietras.dev - scorpion: - public: - scheme: https - host: scorpion.k8s.spietras.dev - port: null debug: false - valuesFrom: - - kind: Secret - name: lotus-helm-secrets-values - valuesKey: values.yaml diff --git a/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/secrets/values.yaml b/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/secrets/values.yaml deleted file mode 100644 index 40ab7298..00000000 --- a/src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize/secrets/values.yaml +++ /dev/null @@ -1,37 +0,0 @@ -lotus: - secrets: - auth: - - ENC[AES256_GCM,data:sAAfVf/R,iv:S+qbh8iW8rpUbBffjR+Z4q6zonWC5D5sc0TyUIRP+38=,tag:tVpMdY/CE4+CMah6c511kA==,type:str] - scorpion: - public: - client: ENC[AES256_GCM,data:d9TjCC0=,iv:sfwK+yFolKJHWVLmdrDzPtbB0y9zt3OC3XAQBwr2ZuQ=,tag:ZdLms1UKraDPie+k1CiPdQ==,type:str] - secret: ENC[AES256_GCM,data:O1wUqPsZ,iv:g1+5ysM/izJ2rOMN7WwESQxB+OadmXln4BrqtM6MTCw=,tag:qdZeQvkcMo7sadTmS43+1w==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age14uepygtepskwehywergh9fe9j2a3ytqd80y9r2ekfmett6rq3peqjtgxns - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGY1ZoYlZvWG04Zk9ZdXh2 - T0VWUk1oY0R0eEtpQnJRcWIzUXozQUlGOVRNCitxY0h5b3l6QnN2ejNZQ3Z1aXJX - aWhuNjZtYVNlTi9vV2pJOXJ3dkpZQjQKLS0tIGtJdFNOaDVtWXQ5aTd5L1diTzhw - c2RmaXczVnY0azVqWEtZTHQ5YUZFYkEK57cPtu0CelzVM9LFR/i3qUbAPt6HRAUZ - jAlPDHIQqQWeJE7x8E3CwCT3Z7LyA3fgSlt8eZ/n1OE6hNc1uWRz4Q== - -----END AGE ENCRYPTED FILE----- - - recipient: age1y5lqafxarcnlrduh8k3tycnaq63v2alagmtkf0k9gd59pg263axqtt928v - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOalFvczJlL2xpUlVEblRD - TGlid0dzRWhxYTBUZENVQzNESGtyTmkvcVFJCmxtWDQyb2VJNUNPaEVJVzVja0RK - aEVOZ2ZsMmZTckduVGRzcHFWSUFJdjAKLS0tIFRHZ3M0dUlob0p6R0JPQlpSWG0x - cm1sN3U1VnZNNTU1NFQ2UlRmSUJiVUkKcDxNEToerq/aAa+m8Bmyg9R+UsuMXwx/ - 1guqoWy3m4ucGQBi7eCswg5m+rGee+FgzlQsan9EQwL8Zhh8sTwlaQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-05T21:12:11Z" - mac: ENC[AES256_GCM,data:jE2+qBterbBOJx9+Uy175qNUobXWm4hnCwjAlDyb0WjT5NWEiyheJYAJC9Gk1GVj/7d4IGq9o24/fFTPz2ri19DGN3fbldZu2gbbKucbRorBVnMUntBz5rYBs6AoTbEqibArEHuL4RMsvc4NHnMTpub2SKoqnInmpi39fQDey/o=,iv:2kiqyHTRmNmIHGjTmS3EM+WQvWHJWeV/bJbnfOhEcj4=,tag:P+nOSvo6Fdotg8/c8IgeRA==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.8.1 diff --git a/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/configurations/names.yaml b/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/configurations/names.yaml deleted file mode 100644 index f1d65122..00000000 --- a/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/configurations/names.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Configure names transformer -nameReference: - - kind: Secret - fieldSpecs: - # Replace secret names in HelmReleases - - group: helm.toolkit.fluxcd.io - kind: HelmRelease - path: spec/valuesFrom/name diff --git a/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/kustomization.yaml b/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/kustomization.yaml index 73bf4d04..19b1b57c 100644 --- a/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/kustomization.yaml +++ b/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/kustomization.yaml @@ -1,17 +1,7 @@ # Create magnolia-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following configuration files -configurations: - - configurations/names.yaml # Include the following resources resources: - resources/release.yaml - resources/repository.yaml -# Generate secrets -secretGenerator: - - files: - # It's important to include extension in the key - # SOPS will use it to determine the format of the content - - values.yaml=secrets/values.yaml - name: magnolia-helm-secrets-values diff --git a/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/resources/release.yaml b/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/resources/release.yaml index 4fa66e2b..a7feb448 100644 --- a/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/resources/release.yaml +++ b/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/resources/release.yaml @@ -18,15 +18,4 @@ spec: postRenderers: [] values: magnolia: - urls: - public: https://magnolia.k8s.spietras.dev - scorpion: - public: - scheme: https - host: scorpion.k8s.spietras.dev - port: null debug: false - valuesFrom: - - kind: Secret - name: magnolia-helm-secrets-values - valuesKey: values.yaml diff --git a/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/secrets/values.yaml b/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/secrets/values.yaml deleted file mode 100644 index cd0e9745..00000000 --- a/src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize/secrets/values.yaml +++ /dev/null @@ -1,37 +0,0 @@ -magnolia: - secrets: - auth: - - ENC[AES256_GCM,data:tB4Jupl9,iv:mAXHi/uJ0wwb0EZu/8aNx1pC1D5tc+AYhHPrUvsm79I=,tag:AUJfasZ3Csp4lpKhl04N4A==,type:str] - scorpion: - public: - client: ENC[AES256_GCM,data:HIXPByuqyyM=,iv:+rjn4w4nyvqxRA0Ivcfc0A6qRb4R3HPqQ/C0JWJ/IYA=,tag:ONa4eBXSn86BYqYG5msfuA==,type:str] - secret: ENC[AES256_GCM,data:2k1+GPMq,iv:pU7GNLImYttQjDDzCVsGJG3VPhxaY2dlHtRwTCs9D3w=,tag:SIWGVoz9Qm9XLmYAAP8qOg==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age14uepygtepskwehywergh9fe9j2a3ytqd80y9r2ekfmett6rq3peqjtgxns - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGY1ZoYlZvWG04Zk9ZdXh2 - T0VWUk1oY0R0eEtpQnJRcWIzUXozQUlGOVRNCitxY0h5b3l6QnN2ejNZQ3Z1aXJX - aWhuNjZtYVNlTi9vV2pJOXJ3dkpZQjQKLS0tIGtJdFNOaDVtWXQ5aTd5L1diTzhw - c2RmaXczVnY0azVqWEtZTHQ5YUZFYkEK57cPtu0CelzVM9LFR/i3qUbAPt6HRAUZ - jAlPDHIQqQWeJE7x8E3CwCT3Z7LyA3fgSlt8eZ/n1OE6hNc1uWRz4Q== - -----END AGE ENCRYPTED FILE----- - - recipient: age1y5lqafxarcnlrduh8k3tycnaq63v2alagmtkf0k9gd59pg263axqtt928v - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOalFvczJlL2xpUlVEblRD - TGlid0dzRWhxYTBUZENVQzNESGtyTmkvcVFJCmxtWDQyb2VJNUNPaEVJVzVja0RK - aEVOZ2ZsMmZTckduVGRzcHFWSUFJdjAKLS0tIFRHZ3M0dUlob0p6R0JPQlpSWG0x - cm1sN3U1VnZNNTU1NFQ2UlRmSUJiVUkKcDxNEToerq/aAa+m8Bmyg9R+UsuMXwx/ - 1guqoWy3m4ucGQBi7eCswg5m+rGee+FgzlQsan9EQwL8Zhh8sTwlaQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-05T16:52:35Z" - mac: ENC[AES256_GCM,data:3dGLeB4kTcwhuq5RRILNfOwE8gq7cZCqI7TOl4QGEjHAZ57dbeQWvcqNIPkvqyUFVPKR2Tc3oPjxnqFT5Z0m0C+Bk5dI1dGWetWm+GHEiYezEsER5s0NprJ49mX1EerMfLxh/Nz9N4Di02SNbj0TqxHrEBrOPKOenIjImJUIBRI=,iv:lCB8KbhL5OzSgW58l5s4SEg+j0p5C9FSlhXcwypBBYo=,tag:v174lXPyjNolLJ6VHIeGfA==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.8.1 diff --git a/src/clusters/main/apps/orchid/kustomize/orchid-helm/kustomize/resources/release.yaml b/src/clusters/main/apps/orchid/kustomize/orchid-helm/kustomize/resources/release.yaml index 48b7802e..a17b6a9c 100644 --- a/src/clusters/main/apps/orchid/kustomize/orchid-helm/kustomize/resources/release.yaml +++ b/src/clusters/main/apps/orchid/kustomize/orchid-helm/kustomize/resources/release.yaml @@ -18,21 +18,19 @@ spec: postRenderers: [] values: orchid: + debug: false + oidc: + google: + domain: radioaktywne.pl urls: - public: https://orchid.k8s.spietras.dev - falcon: - public: + crocus: + host: crocus.k8s.spietras.dev + port: null scheme: https + falcon: host: falcon.k8s.spietras.dev port: null - crocus: - public: scheme: https - host: crocus.k8s.spietras.dev - port: null - oidc: - google: - domain: radioaktywne.pl valuesFrom: - kind: Secret name: orchid-helm-secrets-values diff --git a/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/configurations/names.yaml b/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/configurations/names.yaml deleted file mode 100644 index f1d65122..00000000 --- a/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/configurations/names.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Configure names transformer -nameReference: - - kind: Secret - fieldSpecs: - # Replace secret names in HelmReleases - - group: helm.toolkit.fluxcd.io - kind: HelmRelease - path: spec/valuesFrom/name diff --git a/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/kustomization.yaml b/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/kustomization.yaml index 77905330..bbc7940f 100644 --- a/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/kustomization.yaml +++ b/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/kustomization.yaml @@ -1,17 +1,7 @@ # Create poppy-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following configuration files -configurations: - - configurations/names.yaml # Include the following resources resources: - resources/release.yaml - resources/repository.yaml -# Generate secrets -secretGenerator: - - files: - # It's important to include extension in the key - # SOPS will use it to determine the format of the content - - values.yaml=secrets/values.yaml - name: poppy-helm-secrets-values diff --git a/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/resources/release.yaml b/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/resources/release.yaml index 5ded717a..340ffbae 100644 --- a/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/resources/release.yaml +++ b/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/resources/release.yaml @@ -18,15 +18,4 @@ spec: postRenderers: [] values: poppy: - urls: - public: https://poppy.k8s.spietras.dev - scorpion: - public: - scheme: https - host: scorpion.k8s.spietras.dev - port: null debug: false - valuesFrom: - - kind: Secret - name: poppy-helm-secrets-values - valuesKey: values.yaml diff --git a/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/secrets/values.yaml b/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/secrets/values.yaml deleted file mode 100644 index 5abeb206..00000000 --- a/src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize/secrets/values.yaml +++ /dev/null @@ -1,37 +0,0 @@ -poppy: - secrets: - auth: - - ENC[AES256_GCM,data:IYkY+sNq,iv:X8L33p9Z1Vaxm6+HzeQgeBguD7Umjf/u4FZ3hctuUps=,tag:BvtGNNF6wbFZ4NZh5xw2qA==,type:str] - scorpion: - public: - client: ENC[AES256_GCM,data:r0CGG2Y=,iv:BbCQo5gD3r3SVkk05YvfOhyECFNDTd4S5/Frx9AO6OI=,tag:I3x2NzHY7TeO8xqb75gzjw==,type:str] - secret: ENC[AES256_GCM,data:lF8B8Wkx,iv:I/7d5rENAwJpNpO3AlvhFMbLG7EqQzdIsyiFHxJBPMY=,tag:KDTYNkWV3Z3PcWmG3CMnTA==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age14uepygtepskwehywergh9fe9j2a3ytqd80y9r2ekfmett6rq3peqjtgxns - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGY1ZoYlZvWG04Zk9ZdXh2 - T0VWUk1oY0R0eEtpQnJRcWIzUXozQUlGOVRNCitxY0h5b3l6QnN2ejNZQ3Z1aXJX - aWhuNjZtYVNlTi9vV2pJOXJ3dkpZQjQKLS0tIGtJdFNOaDVtWXQ5aTd5L1diTzhw - c2RmaXczVnY0azVqWEtZTHQ5YUZFYkEK57cPtu0CelzVM9LFR/i3qUbAPt6HRAUZ - jAlPDHIQqQWeJE7x8E3CwCT3Z7LyA3fgSlt8eZ/n1OE6hNc1uWRz4Q== - -----END AGE ENCRYPTED FILE----- - - recipient: age1y5lqafxarcnlrduh8k3tycnaq63v2alagmtkf0k9gd59pg263axqtt928v - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOalFvczJlL2xpUlVEblRD - TGlid0dzRWhxYTBUZENVQzNESGtyTmkvcVFJCmxtWDQyb2VJNUNPaEVJVzVja0RK - aEVOZ2ZsMmZTckduVGRzcHFWSUFJdjAKLS0tIFRHZ3M0dUlob0p6R0JPQlpSWG0x - cm1sN3U1VnZNNTU1NFQ2UlRmSUJiVUkKcDxNEToerq/aAa+m8Bmyg9R+UsuMXwx/ - 1guqoWy3m4ucGQBi7eCswg5m+rGee+FgzlQsan9EQwL8Zhh8sTwlaQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-06T13:44:37Z" - mac: ENC[AES256_GCM,data:iyvMMmSLiVgYIe7U/kf6NIRN80gv63kxHyf5305lRnuYx9AlWayy0CfnG2sfWfNic7MWrJDKn1XsuNT0wTWq8QJbs+Jb1lK3n/Fmsej+zQ32PR8xxkTbJwkjrUkLMrhIyJTJb1ykTDxWUW6vWTPDc+Fybf8eHN/tNXUa8HSOvfc=,iv:dMeulLfmlS9PxNM4zI//VUJPgzWBY6aZ8Xcwv6e2C5s=,tag:3ty0dN1K4BtzlnoDeYkIpQ==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.8.1 diff --git a/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/configurations/names.yaml b/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/configurations/names.yaml deleted file mode 100644 index f1d65122..00000000 --- a/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/configurations/names.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Configure names transformer -nameReference: - - kind: Secret - fieldSpecs: - # Replace secret names in HelmReleases - - group: helm.toolkit.fluxcd.io - kind: HelmRelease - path: spec/valuesFrom/name diff --git a/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/kustomization.yaml b/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/kustomization.yaml index 5b834c6e..f525dd06 100644 --- a/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/kustomization.yaml +++ b/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/kustomization.yaml @@ -1,17 +1,7 @@ # Create tulip-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following configuration files -configurations: - - configurations/names.yaml # Include the following resources resources: - resources/release.yaml - resources/repository.yaml -# Generate secrets -secretGenerator: - - files: - # It's important to include extension in the key - # SOPS will use it to determine the format of the content - - values.yaml=secrets/values.yaml - name: tulip-helm-secrets-values diff --git a/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/resources/release.yaml b/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/resources/release.yaml index 87b36dc6..de7d6fba 100644 --- a/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/resources/release.yaml +++ b/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/resources/release.yaml @@ -18,15 +18,4 @@ spec: postRenderers: [] values: tulip: - urls: - public: https://tulip.k8s.spietras.dev - scorpion: - public: - scheme: https - host: scorpion.k8s.spietras.dev - port: null debug: false - valuesFrom: - - kind: Secret - name: tulip-helm-secrets-values - valuesKey: values.yaml diff --git a/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/secrets/values.yaml b/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/secrets/values.yaml deleted file mode 100644 index 2df6aabb..00000000 --- a/src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize/secrets/values.yaml +++ /dev/null @@ -1,37 +0,0 @@ -tulip: - secrets: - auth: - - ENC[AES256_GCM,data:ML8gFemA,iv:kS3ZrG7xbbM9rw2ZFLw/zbLV0lyITVSZa1Up8+I2LH8=,tag:sOAwI44f5a3hyXs3m2iQpg==,type:str] - scorpion: - public: - client: ENC[AES256_GCM,data:7ng4q4o=,iv:Eu/6L4/FZ9NeRNdRlzlgDHxD3d7YYxo5tobQkNQZBRQ=,tag:CP1c8wltjWJxtrv78H2MzQ==,type:str] - secret: ENC[AES256_GCM,data:jLrde3Sr,iv:9O4t/ScdM71U23CemH5oqesvYmDjb6wH2HxCrN4fx4o=,tag:taEhU9JmqGrz3Bmt7G3h3Q==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age14uepygtepskwehywergh9fe9j2a3ytqd80y9r2ekfmett6rq3peqjtgxns - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGY1ZoYlZvWG04Zk9ZdXh2 - T0VWUk1oY0R0eEtpQnJRcWIzUXozQUlGOVRNCitxY0h5b3l6QnN2ejNZQ3Z1aXJX - aWhuNjZtYVNlTi9vV2pJOXJ3dkpZQjQKLS0tIGtJdFNOaDVtWXQ5aTd5L1diTzhw - c2RmaXczVnY0azVqWEtZTHQ5YUZFYkEK57cPtu0CelzVM9LFR/i3qUbAPt6HRAUZ - jAlPDHIQqQWeJE7x8E3CwCT3Z7LyA3fgSlt8eZ/n1OE6hNc1uWRz4Q== - -----END AGE ENCRYPTED FILE----- - - recipient: age1y5lqafxarcnlrduh8k3tycnaq63v2alagmtkf0k9gd59pg263axqtt928v - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOalFvczJlL2xpUlVEblRD - TGlid0dzRWhxYTBUZENVQzNESGtyTmkvcVFJCmxtWDQyb2VJNUNPaEVJVzVja0RK - aEVOZ2ZsMmZTckduVGRzcHFWSUFJdjAKLS0tIFRHZ3M0dUlob0p6R0JPQlpSWG0x - cm1sN3U1VnZNNTU1NFQ2UlRmSUJiVUkKcDxNEToerq/aAa+m8Bmyg9R+UsuMXwx/ - 1guqoWy3m4ucGQBi7eCswg5m+rGee+FgzlQsan9EQwL8Zhh8sTwlaQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-05T23:18:01Z" - mac: ENC[AES256_GCM,data:k+T5gtL2UEKNZiYjzZ6T0zvGEHTo0qSDhIyHgz9erMXFnLMBxAu79GGnLsIaLw/F6Y5LRd7bHB6rBzazEVy+s1B5p0qj/Q5EuJ4mE6cj11ODu2qgcK6cYivKc2mMOjs1ttynSyGdTuhO3dif3VScMG9S2e4PJygr+nVFdd8ew5k=,iv:ZgfPryZ/RA32KlyuJudcQdMyj3snI4ZV8h9ZfG8U5Y8=,tag:LY6Xu2zKR91utFHRYhov4g==,type:str] - pgp: [] - unencrypted_suffix: _unencrypted - version: 3.8.1 diff --git a/tests/clusters/ci/main/apps/aster/kustomize/aster-helm/kustomize/kustomization.yaml b/tests/clusters/ci/main/apps/aster/kustomize/aster-helm/kustomize/kustomization.yaml index 12c831a2..4e0f59bd 100644 --- a/tests/clusters/ci/main/apps/aster/kustomize/aster-helm/kustomize/kustomization.yaml +++ b/tests/clusters/ci/main/apps/aster/kustomize/aster-helm/kustomize/kustomization.yaml @@ -1,7 +1,5 @@ -# Create aster-helm Kustomization +# Overlay aster-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following resources resources: - - resources/release.yaml - - resources/repository.yaml + - ../../../../../../../../../src/clusters/main/apps/aster/kustomize/aster-helm/kustomize diff --git a/tests/clusters/ci/main/apps/aster/kustomize/aster-helm/kustomize/resources/release.yaml b/tests/clusters/ci/main/apps/aster/kustomize/aster-helm/kustomize/resources/release.yaml deleted file mode 100644 index bff2b410..00000000 --- a/tests/clusters/ci/main/apps/aster/kustomize/aster-helm/kustomize/resources/release.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Create aster Helm release -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: aster -spec: - chart: - spec: - # Use this chart from the repository - chart: aster - # Pin version to major - version: "0.x" - # Use this Helm repository - sourceRef: - kind: HelmRepository - name: radio-aktywne - # This key always needs to be here for patching to work - postRenderers: [] diff --git a/tests/clusters/ci/main/apps/aster/kustomize/aster-helm/kustomize/resources/repository.yaml b/tests/clusters/ci/main/apps/aster/kustomize/aster-helm/kustomize/resources/repository.yaml deleted file mode 100644 index d2eb77e2..00000000 --- a/tests/clusters/ci/main/apps/aster/kustomize/aster-helm/kustomize/resources/repository.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Create aster Helm repository -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: radio-aktywne -spec: - type: oci - url: oci://ghcr.io/radio-aktywne/charts diff --git a/tests/clusters/ci/main/apps/daisy/kustomize/daisy-helm/kustomize/kustomization.yaml b/tests/clusters/ci/main/apps/daisy/kustomize/daisy-helm/kustomize/kustomization.yaml index 1d664f6b..1405ce05 100644 --- a/tests/clusters/ci/main/apps/daisy/kustomize/daisy-helm/kustomize/kustomization.yaml +++ b/tests/clusters/ci/main/apps/daisy/kustomize/daisy-helm/kustomize/kustomization.yaml @@ -1,7 +1,5 @@ -# Create daisy-helm Kustomization +# Overlay daisy-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following resources resources: - - resources/release.yaml - - resources/repository.yaml + - ../../../../../../../../../src/clusters/main/apps/daisy/kustomize/daisy-helm/kustomize diff --git a/tests/clusters/ci/main/apps/daisy/kustomize/daisy-helm/kustomize/resources/release.yaml b/tests/clusters/ci/main/apps/daisy/kustomize/daisy-helm/kustomize/resources/release.yaml deleted file mode 100644 index e8b65522..00000000 --- a/tests/clusters/ci/main/apps/daisy/kustomize/daisy-helm/kustomize/resources/release.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Create daisy Helm release -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: daisy -spec: - chart: - spec: - # Use this chart from the repository - chart: daisy - # Pin version to major - version: "0.x" - # Use this Helm repository - sourceRef: - kind: HelmRepository - name: radio-aktywne - # This key always needs to be here for patching to work - postRenderers: [] diff --git a/tests/clusters/ci/main/apps/daisy/kustomize/daisy-helm/kustomize/resources/repository.yaml b/tests/clusters/ci/main/apps/daisy/kustomize/daisy-helm/kustomize/resources/repository.yaml deleted file mode 100644 index 0f25b49e..00000000 --- a/tests/clusters/ci/main/apps/daisy/kustomize/daisy-helm/kustomize/resources/repository.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Create daisy Helm repository -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: radio-aktywne -spec: - type: oci - url: oci://ghcr.io/radio-aktywne/charts diff --git a/tests/clusters/ci/main/apps/jasmine/kustomize/jasmine-helm/kustomize/kustomization.yaml b/tests/clusters/ci/main/apps/jasmine/kustomize/jasmine-helm/kustomize/kustomization.yaml index f1c0ec98..d47b7d74 100644 --- a/tests/clusters/ci/main/apps/jasmine/kustomize/jasmine-helm/kustomize/kustomization.yaml +++ b/tests/clusters/ci/main/apps/jasmine/kustomize/jasmine-helm/kustomize/kustomization.yaml @@ -1,7 +1,5 @@ -# Create jasmine-helm Kustomization +# Overlay jasmine-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following resources resources: - - resources/release.yaml - - resources/repository.yaml + - ../../../../../../../../../src/clusters/main/apps/jasmine/kustomize/jasmine-helm/kustomize diff --git a/tests/clusters/ci/main/apps/jasmine/kustomize/jasmine-helm/kustomize/resources/release.yaml b/tests/clusters/ci/main/apps/jasmine/kustomize/jasmine-helm/kustomize/resources/release.yaml deleted file mode 100644 index 6b6f8f71..00000000 --- a/tests/clusters/ci/main/apps/jasmine/kustomize/jasmine-helm/kustomize/resources/release.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Create jasmine Helm release -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: jasmine -spec: - chart: - spec: - # Use this chart from the repository - chart: jasmine - # Pin version to major - version: "0.x" - # Use this Helm repository - sourceRef: - kind: HelmRepository - name: radio-aktywne - # This key always needs to be here for patching to work - postRenderers: [] diff --git a/tests/clusters/ci/main/apps/jasmine/kustomize/jasmine-helm/kustomize/resources/repository.yaml b/tests/clusters/ci/main/apps/jasmine/kustomize/jasmine-helm/kustomize/resources/repository.yaml deleted file mode 100644 index 56ca1eae..00000000 --- a/tests/clusters/ci/main/apps/jasmine/kustomize/jasmine-helm/kustomize/resources/repository.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Create jasmine Helm repository -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: radio-aktywne -spec: - type: oci - url: oci://ghcr.io/radio-aktywne/charts diff --git a/tests/clusters/ci/main/apps/lotus/kustomize/lotus-helm/kustomize/kustomization.yaml b/tests/clusters/ci/main/apps/lotus/kustomize/lotus-helm/kustomize/kustomization.yaml index ba888912..c61418cd 100644 --- a/tests/clusters/ci/main/apps/lotus/kustomize/lotus-helm/kustomize/kustomization.yaml +++ b/tests/clusters/ci/main/apps/lotus/kustomize/lotus-helm/kustomize/kustomization.yaml @@ -1,7 +1,5 @@ -# Create lotus-helm Kustomization +# Overlay lotus-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following resources resources: - - resources/release.yaml - - resources/repository.yaml + - ../../../../../../../../../src/clusters/main/apps/lotus/kustomize/lotus-helm/kustomize diff --git a/tests/clusters/ci/main/apps/lotus/kustomize/lotus-helm/kustomize/resources/release.yaml b/tests/clusters/ci/main/apps/lotus/kustomize/lotus-helm/kustomize/resources/release.yaml deleted file mode 100644 index 745cdb8c..00000000 --- a/tests/clusters/ci/main/apps/lotus/kustomize/lotus-helm/kustomize/resources/release.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Create lotus Helm release -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: lotus -spec: - chart: - spec: - # Use this chart from the repository - chart: lotus - # Pin version to major - version: "0.x" - # Use this Helm repository - sourceRef: - kind: HelmRepository - name: radio-aktywne - # This key always needs to be here for patching to work - postRenderers: [] diff --git a/tests/clusters/ci/main/apps/lotus/kustomize/lotus-helm/kustomize/resources/repository.yaml b/tests/clusters/ci/main/apps/lotus/kustomize/lotus-helm/kustomize/resources/repository.yaml deleted file mode 100644 index 7047707d..00000000 --- a/tests/clusters/ci/main/apps/lotus/kustomize/lotus-helm/kustomize/resources/repository.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Create lotus Helm repository -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: radio-aktywne -spec: - type: oci - url: oci://ghcr.io/radio-aktywne/charts diff --git a/tests/clusters/ci/main/apps/magnolia/kustomize/magnolia-helm/kustomize/kustomization.yaml b/tests/clusters/ci/main/apps/magnolia/kustomize/magnolia-helm/kustomize/kustomization.yaml index 19b1b57c..66ea8fb1 100644 --- a/tests/clusters/ci/main/apps/magnolia/kustomize/magnolia-helm/kustomize/kustomization.yaml +++ b/tests/clusters/ci/main/apps/magnolia/kustomize/magnolia-helm/kustomize/kustomization.yaml @@ -1,7 +1,5 @@ -# Create magnolia-helm Kustomization +# Overlay magnolia-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following resources resources: - - resources/release.yaml - - resources/repository.yaml + - ../../../../../../../../../src/clusters/main/apps/magnolia/kustomize/magnolia-helm/kustomize diff --git a/tests/clusters/ci/main/apps/magnolia/kustomize/magnolia-helm/kustomize/resources/release.yaml b/tests/clusters/ci/main/apps/magnolia/kustomize/magnolia-helm/kustomize/resources/release.yaml deleted file mode 100644 index b261aec1..00000000 --- a/tests/clusters/ci/main/apps/magnolia/kustomize/magnolia-helm/kustomize/resources/release.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Create magnolia Helm release -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: magnolia -spec: - chart: - spec: - # Use this chart from the repository - chart: magnolia - # Pin version to major - version: "0.x" - # Use this Helm repository - sourceRef: - kind: HelmRepository - name: radio-aktywne - # This key always needs to be here for patching to work - postRenderers: [] diff --git a/tests/clusters/ci/main/apps/magnolia/kustomize/magnolia-helm/kustomize/resources/repository.yaml b/tests/clusters/ci/main/apps/magnolia/kustomize/magnolia-helm/kustomize/resources/repository.yaml deleted file mode 100644 index 77c83698..00000000 --- a/tests/clusters/ci/main/apps/magnolia/kustomize/magnolia-helm/kustomize/resources/repository.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Create magnolia Helm repository -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: radio-aktywne -spec: - type: oci - url: oci://ghcr.io/radio-aktywne/charts diff --git a/tests/clusters/ci/main/apps/poppy/kustomize/poppy-helm/kustomize/kustomization.yaml b/tests/clusters/ci/main/apps/poppy/kustomize/poppy-helm/kustomize/kustomization.yaml index bbc7940f..11bcdc8e 100644 --- a/tests/clusters/ci/main/apps/poppy/kustomize/poppy-helm/kustomize/kustomization.yaml +++ b/tests/clusters/ci/main/apps/poppy/kustomize/poppy-helm/kustomize/kustomization.yaml @@ -1,7 +1,5 @@ -# Create poppy-helm Kustomization +# Overlay poppy-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following resources resources: - - resources/release.yaml - - resources/repository.yaml + - ../../../../../../../../../src/clusters/main/apps/poppy/kustomize/poppy-helm/kustomize diff --git a/tests/clusters/ci/main/apps/poppy/kustomize/poppy-helm/kustomize/resources/release.yaml b/tests/clusters/ci/main/apps/poppy/kustomize/poppy-helm/kustomize/resources/release.yaml deleted file mode 100644 index 20075054..00000000 --- a/tests/clusters/ci/main/apps/poppy/kustomize/poppy-helm/kustomize/resources/release.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Create poppy Helm release -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: poppy -spec: - chart: - spec: - # Use this chart from the repository - chart: poppy - # Pin version to major - version: "0.x" - # Use this Helm repository - sourceRef: - kind: HelmRepository - name: radio-aktywne - # This key always needs to be here for patching to work - postRenderers: [] diff --git a/tests/clusters/ci/main/apps/poppy/kustomize/poppy-helm/kustomize/resources/repository.yaml b/tests/clusters/ci/main/apps/poppy/kustomize/poppy-helm/kustomize/resources/repository.yaml deleted file mode 100644 index a4ab1d7a..00000000 --- a/tests/clusters/ci/main/apps/poppy/kustomize/poppy-helm/kustomize/resources/repository.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Create poppy Helm repository -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: radio-aktywne -spec: - type: oci - url: oci://ghcr.io/radio-aktywne/charts diff --git a/tests/clusters/ci/main/apps/tulip/kustomize/tulip-helm/kustomize/kustomization.yaml b/tests/clusters/ci/main/apps/tulip/kustomize/tulip-helm/kustomize/kustomization.yaml index f525dd06..7f98386a 100644 --- a/tests/clusters/ci/main/apps/tulip/kustomize/tulip-helm/kustomize/kustomization.yaml +++ b/tests/clusters/ci/main/apps/tulip/kustomize/tulip-helm/kustomize/kustomization.yaml @@ -1,7 +1,5 @@ -# Create tulip-helm Kustomization +# Overlay tulip-helm Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -# Include the following resources resources: - - resources/release.yaml - - resources/repository.yaml + - ../../../../../../../../../src/clusters/main/apps/tulip/kustomize/tulip-helm/kustomize diff --git a/tests/clusters/ci/main/apps/tulip/kustomize/tulip-helm/kustomize/resources/release.yaml b/tests/clusters/ci/main/apps/tulip/kustomize/tulip-helm/kustomize/resources/release.yaml deleted file mode 100644 index a7e2a4ab..00000000 --- a/tests/clusters/ci/main/apps/tulip/kustomize/tulip-helm/kustomize/resources/release.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Create tulip Helm release -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: tulip -spec: - chart: - spec: - # Use this chart from the repository - chart: tulip - # Pin version to major - version: "0.x" - # Use this Helm repository - sourceRef: - kind: HelmRepository - name: radio-aktywne - # This key always needs to be here for patching to work - postRenderers: [] diff --git a/tests/clusters/ci/main/apps/tulip/kustomize/tulip-helm/kustomize/resources/repository.yaml b/tests/clusters/ci/main/apps/tulip/kustomize/tulip-helm/kustomize/resources/repository.yaml deleted file mode 100644 index d04ba6b1..00000000 --- a/tests/clusters/ci/main/apps/tulip/kustomize/tulip-helm/kustomize/resources/repository.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Create tulip Helm repository -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: radio-aktywne -spec: - type: oci - url: oci://ghcr.io/radio-aktywne/charts