Merge pull request #46 from vshn/common-exoscale-api-key

Create common exoscale api-secret
vshn · Nov 11, 2022 · 8c58910 · 8c58910
2 parents c1c5f55 + bcd6a09
commit 8c58910
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 119 deletions.
diff --git a/packages/composition/dbaas/exoscale/mysql.yml b/packages/composition/dbaas/exoscale/mysql.yml
@@ -116,22 +116,3 @@ parameters:
         kind: Namespace
         metadata:
           name: ${pkg.appcat.composition.dbaas.exoscale:secretNamespaces:mysql}
-
-    secrets:
-      exoscale-dbaas-api-access:
-        metadata:
-          namespace: ${crossplane:namespace}
-        stringData:
-          EXOSCALE_API_KEY: '?{vaultkv:${cluster:tenant}/${cluster:name}/appcat/dbaas/provider-exoscale/access-key}'
-          EXOSCALE_API_SECRET: '?{vaultkv:${cluster:tenant}/${cluster:name}/appcat/dbaas/provider-exoscale/secret-key}'
-
-  crossplane:
-    providerConfigs:
-      exoscale-dbaas:
-        apiVersion: exoscale.crossplane.io/v1
-        spec:
-          credentials:
-            source: InjectedIdentity
-            apiSecretRef:
-              name: exoscale-dbaas-api-access
-              namespace: ${crossplane:namespace}
diff --git a/packages/composition/dbaas/exoscale/postgres.yml b/packages/composition/dbaas/exoscale/postgres.yml
@@ -117,14 +117,6 @@ parameters:
         metadata:
           name: ${pkg.appcat.composition.dbaas.exoscale:secretNamespaces:postgres}
 
-    secrets:
-      exoscale-dbaas-api-access:
-        metadata:
-          namespace: ${crossplane:namespace}
-        stringData:
-          EXOSCALE_API_KEY: '?{vaultkv:${cluster:tenant}/${cluster:name}/appcat/dbaas/provider-exoscale/access-key}'
-          EXOSCALE_API_SECRET: '?{vaultkv:${cluster:tenant}/${cluster:name}/appcat/dbaas/provider-exoscale/secret-key}'
-
   crossplane:
     providerConfigs:
       exoscale-dbaas:
@@ -133,5 +125,5 @@ parameters:
           credentials:
             source: InjectedIdentity
             apiSecretRef:
-              name: exoscale-dbaas-api-access
+              name: exoscale-api-access
               namespace: ${crossplane:namespace}
diff --git a/packages/composition/objectstorage/exoscale.yml b/packages/composition/objectstorage/exoscale.yml
@@ -130,22 +130,3 @@ parameters:
         kind: Namespace
         metadata:
           name: ${pkg.appcat.composition.objectstorage.exoscale:secretNamespaces:iamkeys}
-
-    secrets:
-      exoscale-api-access:
-        metadata:
-          namespace: ${crossplane:namespace}
-        stringData:
-          EXOSCALE_API_KEY: '?{vaultkv:${cluster:tenant}/${cluster:name}/appcat/objectstorage/provider-exoscale/access-key}'
-          EXOSCALE_API_SECRET: '?{vaultkv:${cluster:tenant}/${cluster:name}/appcat/objectstorage/provider-exoscale/secret-key}'
-
-  crossplane:
-    providerConfigs:
-      exoscale:
-        apiVersion: exoscale.crossplane.io/v1
-        spec:
-          credentials:
-            source: InjectedIdentity
-            apiSecretRef:
-              name: exoscale-api-access
-              namespace: ${crossplane:namespace}
diff --git a/packages/provider/exoscale.yml b/packages/provider/exoscale.yml
@@ -14,3 +14,22 @@ parameters:
     providers:
       exoscale:
         package: ${pkg.appcat.provider.exoscale:images:provider-exoscale:registry}/${pkg.appcat.provider.exoscale:images:provider-exoscale:repository}:${pkg.appcat.provider.exoscale:images:provider-exoscale:tag}
+
+    providerConfigs:
+      exoscale:
+        apiVersion: exoscale.crossplane.io/v1
+        spec:
+          credentials:
+            source: InjectedIdentity
+            apiSecretRef:
+              name: exoscale-api-access
+              namespace: ${crossplane:namespace}
+
+  appcat:
+    secrets:
+      exoscale-api-access:
+        metadata:
+          namespace: ${crossplane:namespace}
+        stringData:
+          EXOSCALE_API_KEY: '?{vaultkv:${cluster:tenant}/${cluster:name}/appcat/provider-exoscale/access-key}'
+          EXOSCALE_API_SECRET: '?{vaultkv:${cluster:tenant}/${cluster:name}/appcat/provider-exoscale/secret-key}'
diff --git a/packages/tests/golden/composition-dbaas-mysql-exoscale/appcat/appcat/secrets.yaml b/packages/tests/golden/composition-dbaas-mysql-exoscale/appcat/appcat/secrets.yaml
diff --git a/...ts/golden/composition-dbaas-mysql-exoscale/crossplane/crossplane/70_provider_configs.yaml b/...ts/golden/composition-dbaas-mysql-exoscale/crossplane/crossplane/70_provider_configs.yaml
@@ -1,19 +1,3 @@
-apiVersion: exoscale.crossplane.io/v1
-kind: ProviderConfig
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-    argocd.argoproj.io/sync-wave: '10'
-  labels:
-    name: exoscale-dbaas
-  name: exoscale-dbaas
-spec:
-  credentials:
-    apiSecretRef:
-      name: exoscale-dbaas-api-access
-      namespace: syn-crossplane
-    source: InjectedIdentity
----
 apiVersion: kubernetes.crossplane.io/v1alpha1
 kind: ProviderConfig
 metadata:

diff --git a/packages/tests/golden/composition-dbaas-postgres-exoscale/appcat/appcat/secrets.yaml b/packages/tests/golden/composition-dbaas-postgres-exoscale/appcat/appcat/secrets.yaml
diff --git a/...golden/composition-dbaas-postgres-exoscale/crossplane/crossplane/70_provider_configs.yaml b/...golden/composition-dbaas-postgres-exoscale/crossplane/crossplane/70_provider_configs.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   credentials:
     apiSecretRef:
-      name: exoscale-dbaas-api-access
+      name: exoscale-api-access
       namespace: syn-crossplane
     source: InjectedIdentity
 ---

diff --git a/packages/tests/golden/composition-objectstorage-exoscale/appcat/appcat/secrets.yaml b/packages/tests/golden/composition-objectstorage-exoscale/appcat/appcat/secrets.yaml
diff --git a/.../golden/composition-objectstorage-exoscale/crossplane/crossplane/70_provider_configs.yaml b/.../golden/composition-objectstorage-exoscale/crossplane/crossplane/70_provider_configs.yaml
@@ -1,19 +1,3 @@
-apiVersion: exoscale.crossplane.io/v1
-kind: ProviderConfig
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
-    argocd.argoproj.io/sync-wave: '10'
-  labels:
-    name: exoscale
-  name: exoscale
-spec:
-  credentials:
-    apiSecretRef:
-      name: exoscale-api-access
-      namespace: syn-crossplane
-    source: InjectedIdentity
----
 apiVersion: kubernetes.crossplane.io/v1alpha1
 kind: ProviderConfig
 metadata:

diff --git a/packages/tests/golden/provider-exoscale/crossplane/crossplane/70_provider_configs.yaml b/packages/tests/golden/provider-exoscale/crossplane/crossplane/70_provider_configs.yaml
@@ -0,0 +1,15 @@
+apiVersion: exoscale.crossplane.io/v1
+kind: ProviderConfig
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+    argocd.argoproj.io/sync-wave: '10'
+  labels:
+    name: exoscale
+  name: exoscale
+spec:
+  credentials:
+    apiSecretRef:
+      name: exoscale-api-access
+      namespace: syn-crossplane
+    source: InjectedIdentity
diff --git a/packages/tests/provider-exoscale.yml b/packages/tests/provider-exoscale.yml
@@ -2,3 +2,8 @@ classes:
   - ..provider.exoscale
 
 # parameters: {}
+
+parameters:
+  crossplane:
+    # This is not resolving during "commodore package compile", so we provide it explicitly
+    namespace: syn-crossplane