Merge pull request #3755 from uselagoon/reuse-sshkeys

test: reuse sshkeys from ci for local dev
uselagoon · Jun 28, 2024 · c8418d2 · c8418d2
2 parents c4572ea + 507cf1a
commit c8418d2
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 27 deletions.
diff --git a/local-dev/api-data-watcher-pusher/api-data/01-populate-api-data-lagoon-demo.gql b/local-dev/api-data-watcher-pusher/api-data/01-populate-api-data-lagoon-demo.gql
@@ -757,4 +757,30 @@ mutation PopulateApi {
   ) {
     name
   }
+  PlatformOwnerSshKeyEd25519: addSshKey(
+    input: {
+      id: 5
+      name: "sshkey-platform-owner-ed25519"
+      keyValue: "AAAAC3NzaC1lZDI1NTE5AAAAIMdEs1h19jv2UrbtKcqPDatUxT9lPYcbGlEAbInsY8Ka"
+      keyType: SSH_ED25519
+      user: {
+        email: "[email protected]"
+      }
+    }
+  ) {
+    id
+  }
+  MaintainerSshKeyEcdsa: addSshKey(
+    input: {
+      id: 6
+      name: "sshkey-maintainer-ecdsa"
+      keyValue: "AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAD8E5wfvLg8vvfO9mmHVsZQK8dNgdKM5FrTxL4ORDq66Z50O8zUzBwF1VTO5Zx+qwB7najMdWsnW00BC6PMysSNJQD5HI4CokyKqmGdeSXcROYwvYOjlDQ+jD5qOSmkllRZZnkEYXE5FVBXaZWToyfGUGIoECvKGUQZxkBDHsbK13JdfA=="
+      keyType: ECDSA_SHA2_NISTP521
+      user: {
+        email: "[email protected]"
+      }
+    }
+  ) {
+    id
+  }
 }
diff --git a/local-dev/api-data-watcher-pusher/api-data/03-populate-api-data-ci-local-control-k8s.gql b/local-dev/api-data-watcher-pusher/api-data/03-populate-api-data-ci-local-control-k8s.gql
@@ -41,7 +41,7 @@ mutation PopulateApi {
   CiCustomerSshKeyRsa: addSshKey(
     input: {
       id: 4
-      name: "ci-customer-sshkey-rsa"
+      name: "sshkey-ci-customer-user-rsa"
       keyValue: "AAAAB3NzaC1yc2EAAAADAQABAAACAQDEZlms5XsiyWjmnnUyhpt93VgHypse9Bl8kNkmZJTiM3Ex/wZAfwogzqd2LrTEiIOWSH1HnQazR+Cc9oHCmMyNxRrLkS/MEl0yZ38Q+GDfn37h/llCIZNVoHlSgYkqD0MQrhfGL5AulDUKIle93dA6qdCUlnZZjDPiR0vEXR36xGuX7QYAhK30aD2SrrBruTtFGvj87IP/0OEOvUZe8dcU9G/pCoqrTzgKqJRpqs/s5xtkqLkTIyR/SzzplO21A+pCKNax6csDDq3snS8zfx6iM8MwVfh8nvBW9seax1zBvZjHAPSTsjzmZXm4z32/ujAn/RhIkZw3ZgRKrxzryttGnWJJ8OFyF31JTJgwWWuPdH53G15PC83ZbmEgSV3win51RZRVppN4uQUuaqZWG9wwk2a6P5aen1RLCSLpTkd2mAEk9PlgmJrf8vITkiU9pF9n68ENCoo556qSdxW2pxnjrzKVPSqmqO1Xg5K4LOX4/9N4n4qkLEOiqnzzJClhFif3O28RW86RPxERGdPT81UI0oDAcU5euQr8Emz+Hd+PY1115UIld3CIHib5PYL9Ee0bFUKiWpR/acSe1fHB64mCoHP7hjFepGsq7inkvg2651wUDKBshGltpNkMj6+aZedNc0/rKYyjl80nT8g8QECgOSRzpmYp0zli2HpFoLOiWw=="
       keyType: SSH_RSA
       user: {
@@ -51,32 +51,6 @@ mutation PopulateApi {
   ) {
     id
   }
-  CiCustomerSshKeyEd25519: addSshKey(
-    input: {
-      id: 5
-      name: "ci-customer-sshkey-ed25519"
-      keyValue: "AAAAC3NzaC1lZDI1NTE5AAAAIMdEs1h19jv2UrbtKcqPDatUxT9lPYcbGlEAbInsY8Ka"
-      keyType: SSH_ED25519
-      user: {
-        email: "[email protected]"
-      }
-    }
-  ) {
-    id
-  }
-  CiCustomerSshKeyEcdsa: addSshKey(
-    input: {
-      id: 6
-      name: "ci-customer-sshkey-ecdsa"
-      keyValue: "AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAD8E5wfvLg8vvfO9mmHVsZQK8dNgdKM5FrTxL4ORDq66Z50O8zUzBwF1VTO5Zx+qwB7najMdWsnW00BC6PMysSNJQD5HI4CokyKqmGdeSXcROYwvYOjlDQ+jD5qOSmkllRZZnkEYXE5FVBXaZWToyfGUGIoECvKGUQZxkBDHsbK13JdfA=="
-      keyType: ECDSA_SHA2_NISTP521
-      user: {
-        email: "[email protected]"
-      }
-    }
-  ) {
-    id
-  }
 
   ### Add Users to Groups
   CiCustomerUserAddRsa: addUserToGroup(

diff --git a/local-dev/cli_id_rsa → local-dev/sshkey-ci-customer-user-rsa b/local-dev/cli_id_rsa → local-dev/sshkey-ci-customer-user-rsa
diff --git a/local-dev/cli_id_rsa.pub → local-dev/sshkey-ci-customer-user-rsa.pub b/local-dev/cli_id_rsa.pub → local-dev/sshkey-ci-customer-user-rsa.pub
diff --git a/local-dev/cli_id_ecdsa → local-dev/sshkey-maintainer-ecdsa b/local-dev/cli_id_ecdsa → local-dev/sshkey-maintainer-ecdsa
diff --git a/local-dev/cli_id_ecdsa.pub → local-dev/sshkey-maintainer-ecdsa.pub b/local-dev/cli_id_ecdsa.pub → local-dev/sshkey-maintainer-ecdsa.pub
diff --git a/local-dev/cli_id_ed25519 → local-dev/sshkey-platform-owner-ed25519 b/local-dev/cli_id_ed25519 → local-dev/sshkey-platform-owner-ed25519
diff --git a/local-dev/cli_id_ed25519.pub → local-dev/sshkey-platform-owner-ed25519.pub b/local-dev/cli_id_ed25519.pub → local-dev/sshkey-platform-owner-ed25519.pub