From 0b2e75b3137c2fc0f11e69ae7193aabf831f4c71 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Sun, 21 Jan 2024 13:53:16 -0800 Subject: [PATCH] ops(dex): fix config --- k8s/system/dex/manifests/sopssecret.yaml | 11 +++++++---- nixos/k8s.nix | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/k8s/system/dex/manifests/sopssecret.yaml b/k8s/system/dex/manifests/sopssecret.yaml index 55512a7a..77168a47 100644 --- a/k8s/system/dex/manifests/sopssecret.yaml +++ b/k8s/system/dex/manifests/sopssecret.yaml @@ -7,9 +7,12 @@ metadata: spec: suspend: false secretTemplates: + - name: ENC[AES256_GCM,data:zSYK+fZ6eBCVlREH2/1KHTrQC9d+,iv:Mcv0MQqsvJj3O7jERy2FLzobBA14mRvD2qyzROjQVJ0=,tag:z0Kdqi4o6Gws+gGL1rgUNA==,type:str] + data: + tls.crt: ENC[AES256_GCM,data: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,iv:XcCemfQUkQCcmDm0oTSt0j8oCC5e6bL4WK7QtiCe3eA=,tag:VefSnqtTgepSJNel2sVMbA==,type:str] + tls.key: ENC[AES256_GCM,data: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,iv:LJZWgERviWayqU2kEWm3Gr7BrSR2Oas0K13IBwDq+iY=,tag:KkWYFKBYhdm8cjfVc0hz/Q==,type:str] - name: ENC[AES256_GCM,data:pZILaH34uFgX7A==,iv:I46DI6jjiRjG1UknTCNHWjodEqBkEOp/rI8kEkJvY/s=,tag:6mAsRl7LQQRu1QE0FwQbTQ==,type:str] - stringData: - config.yaml: ENC[AES256_GCM,data:8FS47NxDNV465qE+lCbpc36jpN4WsLAngZfdlzvHxnf3+ca78sk2XieuqoADkRzsZc+Nk3PnzU2h6yZLWBh5433z3nQnhBp68ILbdeB5ivWULvCO7wbx8SCc/tz4y5MPq1Z2ZSwL8FsZSri+U+1tRI9qzHtWizPoJwosO7+6p/dz8OwdeCvx3JKar5j54ajVxcsu08c6+J7AkTAyQVT1h6p5JVqOBsuE/912VjK3rFzXvQSKHA6G9BOt6Gzm,iv:eqLX7uKnjRyMNXMP7LwSXi1BTtrF3AzcNPZat/pJSek=,tag:u9ouY1DaXWACQdy7IK8zfQ==,type:str] + data: ENC[AES256_GCM,data:uShmgl4P6UWAPC2N0N3T6ZUASsQRWCd4DHnmB2uw6tN6ViRN0dV/sghbIzxjfO9DClyMZ79xVByAuCZXroPlHLNKZ3Dt5HpSd/i6nFdfsWgNdSLEaGbV3gXCMWQ5izZy/hoT/4HrsUub9f7zOD7iLrGKD8tvk/UYPl4WDBm02TxkUQq4+rXLmGAW+RXeU0wc1rvD3pPQwQDE4wD4Z/8/lQmMoJz2IX1u3oPr6ccRhQmtXsP45xwIpGsFeFe/XehAk4G20Qe7Pr5+5c8/FLPZbpCSm/+4vQ4m6fush0LcSflaN8t4f1wm17qjttgzZzN298ovrAB9aBycxXk7G4UoHD1oUkg03faySippPuBOQ9/EtlU8CYW044T1GqMcTWmE4LEAmWrrwX3QgaLKRYpaCvyYuFF/aHxWpe9VNSnu9nRtP4nYJcSCOEZv0KEJn230T0Z+n8noKFYanUEhcY92sqBrKTC7l4ZwVfv3SpzrTNufl83tlSfINg3x5SwzMVQLxdHHQWiFg2nQk/1NaNNz4+cmxm2mtPhG1XYvKBQGIgl/4+WLxPhHIdrgH6xXEgyzRwJL3jppI2guwJN3ooCGYlhiQKFkQJ4zU6mYxmzNmYXWgSiMG2XGfBxkkzzQQRLc7xYiGuqkxlLu29u3LS/S0mPDNrui8UKxzbAYKTTMn1d/cuMOqa4RburOA3EqsWeYpibNF2zyc0JhLXwlaGYyhfnq1T0sgDJ5SutAOdWA/n73LhP7y+3sVZLC9AQd8/e1WrZdCidNG6gWnf7+v1DzRhfhNKG3+lIz5C/VqF+Qhi9AcnTQ0IJfYODQOCaTBT9a2+8ZaosINrrw5DdBK3ywDvjBpX9xqWFSuzdEnR8rPG76POsdaHOD6TFKtwI591ILx61MdhWH2JZ8rMgn2HYrz8WpY6z/0U1TupHp1092hnunihizdxOd2bxabM9TpEEx/dJHYCILcuYiZAWK+RguiU2HGj/wnoQ6eR+equaF+lGPtTlNwqPG5ZWXBeaUpj0dir3iCXyf6z2bbYFwGVGOAt6FLc1RI5taQkirtbic5L0A/N2tq8tf1dEzStZsW0iH4OOc4vhcSXh5nCPSSj94j9Xz12s/czd2MqKy3be6S6VGHptxW2BU4NBCG9SxJumPt/3FFy0PkOw4CkQYaI4hmfBlNxDzFbh3C6iBaj1Tua8OAFs3DpE0zCn3LOsLD4VGswGaS+WiKnFRkcdmoeiXUOUgJ5SUKASEHDkpw7/0SGxvah6/vmlU2qW/+W/18nZwpLnH7hbLOacA4WYPpbYJMSazzrhBUVn1CO31QI2y/dXt+3MrERSdE3EhXiY4Iv6wkId02NHX9MthvzinkzfvgRDYvja85boYcSri5rgr/uvxqL7C9jGgStmBD4yZ7XB8Tq+rRIVBlGIpfv3C5LiUlxODD7NDZlSVQWBh/U6wCw8I9ESKg8bDFwqfYLKzk9e2E+IHU1lvw9bxZV5cK4Xg1QUpI/10j22Y5J4IQm/u64r2f5P6zhJ2FmNgXlqURqld5XywKc8lNHkXgevtqzPbkek6JdNrZdiaoa5XXtxUIfK3YgkEuVWwIET1AGpSUc1C3TR/Ig29F2+65YKzWa+0+Un9oh2kQTOfZSrTCF0tFUOR84GJqecBwX2i3MhORzeiM+1iXvQixq8qmL5ETP950JMWD/+bxRByB8ipkiZhbyEs9nO9ZMwxcrLDKQC/o2i1nezexe3yTUmqAv3YHRT88SFWsMr5cwm8PBdQt5YQ70fsEkffLJbHMRaM4aBsCQvy2BMsVxxJI6FNu3qU0JjUhg==,iv:q/MtdXHjq2Yjrkc5ZVRsQx+Zh20QMHZWzzlM4JmX/Go=,tag:VfzFcofG+Jft2gxCF/7cZg==,type:str] sops: kms: [] gcp_kms: [] @@ -25,8 +28,8 @@ sops: UnVLNEt5N1laMWcrRWF0RHNqY3pyUTAKURvlCLdILf5LgU8dmXTIsmTWOnimznv+ Dd2iOWPfp//ZIxzRmDDLnIw+wQdB/JSClsVE+655G6YCS4y+lRproQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-01-21T21:15:03Z" - mac: ENC[AES256_GCM,data:jOUQ2ezr5ftUgkOAV6qumek5aBZCw+ezI7xT3z6mFzfUfk1nlEb63gasrzTNSXraWW4/rGiWG/SCnivrUc4TosIgxXB0qQ0zQ4e+xaaClbMP5xaxGOula6vU//Q15gv4X3Qam/1lEwyBHelXddkA4MMvTMN1oJH15pKsFiPCLjw=,iv:QnRuxDzOs+S0lxul7VltaBy/SafFaGLmQxzxjXx4oUQ=,tag:12m4uq0VJ4mr6kmhZwJpsg==,type:str] + lastmodified: "2024-01-21T21:52:56Z" + mac: ENC[AES256_GCM,data:Ar01U061GMF4mw792cYdUNf8rbWIfmINQHecQWutbKZMERtJV3RivjDYS8i1M93zObB9uelNEW1u2taxUyL6YYRU6BvGt5y9e6wB6N7uKdNzD+npUJizEFlI2bOVFQ6T85JTSKEvSPoTnMl2se8gG5u6nzv63ukXlhPOcdthamk=,iv:KDNEdrskUNFbF+5+/LLAY4BXLy+0bE32SYuQsCIBERo=,tag:LAWh1rt9A2LDgNoqrL07Zg==,type:str] pgp: - created_at: "2024-01-21T20:42:04Z" enc: |- diff --git a/nixos/k8s.nix b/nixos/k8s.nix index 9e11ff80..2e223802 100644 --- a/nixos/k8s.nix +++ b/nixos/k8s.nix @@ -41,11 +41,13 @@ in { advertiseAddress = kubeMasterIP; extraOpts = escapeShellArgs [ "--service-node-port-range=1-65535" - "--oidc-issuer-url=https://dex.gensokyo.zone:32000" + /* + "--oidc-issuer-url=https://dex.gensokyo.zone:32000" "--oidc-client-id=kuwubernetes" "--oidc-ca-file=/etc/dex-ssl/ca.pem" "--oidc-username-claim=email" "--oidc-groups-claim=groups" + */ ]; allowPrivileged = true; };