cloud-pi-native · mathieulaude · Jan 23, 2025 · Jan 7, 2025
diff --git a/apps/client/src/components/ClusterForm.vue b/apps/client/src/components/ClusterForm.vue
@@ -36,6 +36,7 @@ const props = withDefaults(defineProps<{
     clusterResources: false,
     privacy: ClusterPrivacy.DEDICATED,
     infos: '',
+    external: false,
     id: '',
     kubeconfig: {
       cluster: {
@@ -289,6 +290,14 @@ const isConnectionDetailsShown = ref(true)
         name="isClusterSkipTlsVerify"
         :disabled="localCluster.label === inClusterLabel"
       />
+
+      <DsfrCheckbox
+        id="externalClusterCbx"
+        v-model="localCluster.external"
+        label="Cluster externe"
+        hint="La console DSO n'essaiera pas de joindre l'API de ce cluster, le ArgoCD de la zone de chargera de configurer celui-ci."
+        name="isExternalCluster"
+      />
     </template>
     <h4
       class="mb-1 inline-block"

diff --git a/apps/server/src/prisma/migrations/20250107104749_dso/migration.sql b/apps/server/src/prisma/migrations/20250107104749_dso/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Cluster" ADD COLUMN     "external" BOOLEAN NOT NULL DEFAULT false;
diff --git a/apps/server/src/prisma/schema/topography.prisma b/apps/server/src/prisma/schema/topography.prisma
@@ -8,6 +8,7 @@ model Cluster {
   createdAt        DateTime       @default(now())
   updatedAt        DateTime       @updatedAt
   infos            String?        @db.VarChar(200)
+  external         Boolean        @default(false)
   zoneId           String         @db.Uuid
   kubeconfig       Kubeconfig     @relation(fields: [kubeConfigId], references: [id], onDelete: Cascade)
   zone             Zone           @relation(fields: [zoneId], references: [id])

diff --git a/apps/server/src/resources/cluster/business.spec.ts b/apps/server/src/resources/cluster/business.spec.ts
@@ -80,6 +80,7 @@ describe('test Cluster business logic', () => {
         clusterResources: false,
         kubeconfig: { cluster: { tlsServerName: faker.internet.domainName() }, user: {} },
         label: faker.string.alpha(10),
+        external: false,
       }, userId, reqId)
 
       expect(response).not.instanceOf(ErrorResType)

diff --git a/apps/server/src/resources/cluster/queries.ts b/apps/server/src/resources/cluster/queries.ts
@@ -29,6 +29,7 @@ export async function getClustersAssociatedWithProject(projectId: Project['id'])
       id: true,
       infos: true,
       label: true,
+      external: true,
       privacy: true,
       secretName: true,
       kubeconfig: true,
@@ -107,6 +108,7 @@ export function getClusterDetails(id: Cluster['id']) {
       id: true,
       clusterResources: true,
       infos: true,
+      external: true,
       label: true,
       privacy: true,
       kubeconfig: true,
@@ -197,6 +199,7 @@ export function listClusters(where: Prisma.ClusterWhereInput) {
       clusterResources: true,
       privacy: true,
       infos: true,
+      external: true,
       zoneId: true,
     },
   })

diff --git a/apps/server/src/resources/cluster/router.spec.ts b/apps/server/src/resources/cluster/router.spec.ts
@@ -60,6 +60,7 @@ describe('test clusterContract', () => {
         id: faker.string.uuid(),
         clusterResources: true,
         infos: '',
+        external: false,
         label: faker.string.alpha(),
         privacy: 'public',
         stageIds: [],
@@ -127,6 +128,7 @@ describe('test clusterContract', () => {
       id: faker.string.uuid(),
       clusterResources: true,
       infos: '',
+      external: true,
       label: faker.string.alpha(),
       privacy: 'public',
       stageIds: [],
@@ -180,6 +182,7 @@ describe('test clusterContract', () => {
     const cluster: Omit<ClusterDetails, 'id'> = {
       clusterResources: true,
       infos: '',
+      external: false,
       label: faker.string.alpha(),
       privacy: 'public',
       stageIds: [],

diff --git a/apps/server/src/resources/project/queries.ts b/apps/server/src/resources/project/queries.ts
@@ -133,6 +133,7 @@ export function getProjectInfosByIdOrThrow(projectId: Project['id']) {
           id: true,
           label: true,
           privacy: true,
+          external: true,
           clusterResources: true,
           infos: true,
           zone: true,
@@ -239,6 +240,7 @@ const clusterInfosSelect = {
   id: true,
   infos: true,
   label: true,
+  external: true,
   privacy: true,
   secretName: true,
   kubeconfig: true,

diff --git a/apps/server/src/resources/repository/router.spec.ts b/apps/server/src/resources/repository/router.spec.ts
@@ -27,7 +27,7 @@ describe('repositoryRouter tests', () => {
     externalRepoUrl: `${faker.internet.url()}.git`,
     isPrivate: true,
     externalToken: faker.string.alpha(),
-    externalUserName: faker.internet.userName(),
+    externalUserName: faker.internet.username(),
     isInfra: false,
     internalRepoName: faker.string.alpha({ length: 5, casing: 'lower' }),
   }

diff --git a/packages/hooks/src/hooks/index.ts b/packages/hooks/src/hooks/index.ts
@@ -53,6 +53,7 @@ export interface ClusterObject {
   id: string
   label: string
   privacy: 'public' | 'dedicated'
+  external: boolean
   secretName: string
   clusterResources: boolean
   infos: string | null

diff --git a/packages/shared/src/schemas/cluster.ts b/packages/shared/src/schemas/cluster.ts
@@ -13,6 +13,7 @@ export const CleanedClusterSchema = z.object({
     .optional()
     .nullable()
     .transform(value => value ?? ''),
+  external: z.boolean(),
   clusterResources: z.boolean(),
   privacy: ClusterPrivacySchema,
   zoneId: z.string()

diff --git a/packages/shared/src/utils/schemas.spec.ts b/packages/shared/src/utils/schemas.spec.ts
@@ -186,6 +186,7 @@ describe('schemas utils', () => {
     const toParse = {
       id: faker.string.uuid(),
       label: 'cluster',
+      external: false,
       clusterResources: true,
       infos: 'Infos du cluster',
       privacy: ClusterPrivacy.DEDICATED,
@@ -209,6 +210,7 @@ describe('schemas utils', () => {
     const toParse = {
       id: faker.string.uuid(),
       label: 'cluster',
+      external: true,
       clusterResources: true,
       privacy: ClusterPrivacy.PUBLIC,
       zoneId: faker.string.uuid(),

diff --git a/packages/test-utils/src/utils/random-utils.ts b/packages/test-utils/src/utils/random-utils.ts
@@ -55,6 +55,7 @@ export function getRandomCluster({ projectIds = repeatFn(2)(faker.string.uuid),
     id: faker.string.uuid(),
     label: faker.lorem.word(),
     infos: faker.lorem.sentence(8),
+    external: false,
     zoneId,
     projectIds: privacy === ClusterPrivacy.DEDICATED ? projectIds : [],
     stageIds,

diff --git a/plugins/argocd/src/functions.ts b/plugins/argocd/src/functions.ts
@@ -83,7 +83,7 @@ export const upsertProject: StepCall<Project> = async (payload) => {
           vaultApi,
         )
 
-        if (cluster.label !== inClusterLabel && !cluster.user.keyData && !cluster.user.token) {
+        if (cluster.label !== inClusterLabel && cluster.external) {
           console.log(`Direct argocd API calls are disabled for cluster ${cluster.label}`)
           return undefined
         }

diff --git a/plugins/kubernetes/src/api.ts b/plugins/kubernetes/src/api.ts
@@ -28,7 +28,7 @@ function makeClusterApi(cluster: ClusterObject): KubeConfig | undefined {
     kc.loadFromCluster()
     return kc
   }
-  if (!cluster.user.keyData && !cluster.user.token) {
+  if (cluster.external) {
     // Special case: disable direct calls to the cluster
     return undefined
   }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "Cluster" ADD COLUMN "external" BOOLEAN NOT NULL DEFAULT false;