[UP] ⬆️ update dependencies + moove to vitejs

Signed-off-by: Eneman <[email protected]>

deploy/configmap.yml

@@ -0,0 +1,29 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: onboarding
+data:
+  io.insee.dev.k8sonboarding.clusterName: ""
+  io.insee.dev.k8sonboarding.insecure: ""
+  io.insee.dev.k8sonboarding.apiserver-url: ""
+  io.insee.dev.k8sonboarding.user-prefix: ""
+  io.insee.dev.k8sonboarding.group-prefix: ""
+  io.insee.dev.k8sonboarding.namespace-prefix: ""
+  io.insee.dev.k8sonboarding.namespace-group-prefix: ""
+  io.insee.dev.k8sonboarding.name-namespace-admin: ""
+  io.insee.dev.k8sonboarding.jwt.username-claim: ""
+  spring.security.oauth2.resourceserver.jwt.issuer-uri: ""
+  spring.security.oauth2.resourceserver.jwt.jwk-set-uri: ""
+  io.insee.dev.k8sonboarding.ui.clientId: ""
+  io.insee.dev.k8sonboarding.ui.authority: ""
+  io.insee.dev.k8sonboarding.ui.groupFilter: ""
+  io.insee.dev.k8sonboarding.ui.user-namespace-enabled: ""
+  io.insee.dev.k8sonboarding.ui.namespace-creation-allowed: ""
+  io.insee.dev.k8sonboarding.namespace-quota.memoryRequests: ""
+  io.insee.dev.k8sonboarding.namespace-quota.cpuRequests: ""
+  io.insee.dev.k8sonboarding.namespace-quota.memoryLimits: ""
+  io.insee.dev.k8sonboarding.namespace-quota.cpuLimits: ""
+  io.insee.dev.k8sonboarding.namespace-quota.storageRequests: ""
+  io.insee.dev.k8sonboarding.namespace-quota.storageLimits: ""
+  io.insee.dev.k8sonboarding.namespace-quota.podsCount: ""
+  io.insee.dev.k8sonboarding.does-remove-suffix: ""

deploy/deployment.yml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: onboarding
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: onboarding
@@ -15,3 +15,13 @@ spec:
       containers:
         - name: onboarding
           image: inseefrlab/k8s-onboarding:alpha
+          envFrom:
+            - configMapRef:
+                name: onboarding
+          resources:
+            limits:
+              cpu: "1"
+              memory: 4Gi
+            requests:
+              cpu: "0.5"
+              memory: 1Gi

deploy/ingress.yml

@@ -1,18 +1,18 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: onboarding
-  annotations:
-    kubernetes.io/ingress.class: nginx
+  labels:
+    name: onboarding
 spec:
-  tls:
-    - hosts:
-        - onboarding.example.com
   rules:
     - host: onboarding.example.com
       http:
         paths:
-          - path: /
+          - pathType: Prefix
+            path: "/"
             backend:
-              serviceName: onboarding
-              servicePort: http
+              service:
+                name: onboarding
+                port:
+                  name: http

pom.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.4</version>
+		<version>3.2.2</version>
 		<relativePath />
 		<!-- lookup parent from repository -->
 	</parent>
@@ -45,12 +46,12 @@
 		<dependency>
 			<groupId>io.fabric8</groupId>
 			<artifactId>kubernetes-client</artifactId>
-			<version>6.1.1</version>
+			<version>6.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>io.fabric8</groupId>
 			<artifactId>kubernetes-server-mock</artifactId>
-			<version>6.1.1</version>
+			<version>6.10.0</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -62,40 +63,30 @@
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-ui</artifactId>
-			<version>1.6.11</version>
+			<version>1.7.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.security.oauth</groupId>
-			<artifactId>spring-security-oauth2</artifactId>
-			<version>2.5.2.RELEASE</version>
-		</dependency>
 	</dependencies>
 
-
-
-
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-
 			<plugin>
 				<groupId>com.github.eirslett</groupId>
 				<artifactId>frontend-maven-plugin</artifactId>
-				<version>1.12.1</version>
+				<version>1.15.0</version>
 				<configuration>
 					<workingDirectory>ui</workingDirectory>
 					<installDirectory>target</installDirectory>
-					<yarnVersion>v1.22.19</yarnVersion>
-					<nodeVersion>v16.17.0</nodeVersion>
+					<yarnVersion>v1.22.21</yarnVersion>
+					<nodeVersion>v20.11.0</nodeVersion>
 				</configuration>
 				<executions>
 					<execution>
@@ -135,7 +126,7 @@
 						<configuration>
 							<target>
 								<copy todir="${project.build.directory}/classes/public">
-									<fileset dir="${project.basedir}/ui/build" />
+									<fileset dir="${project.basedir}/ui/dist" />
 								</copy>
 							</target>
 						</configuration>
@@ -148,4 +139,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>

src/main/java/io/insee/dev/k8sonboarding/configuration/UserProviderConfiguration.java

@@ -1,8 +1,13 @@
 package io.insee.dev.k8sonboarding.configuration;
 
-import org.springframework.beans.factory.annotation.Value;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.jwt.Jwt;
 
 import io.insee.dev.k8sonboarding.configuration.security.UserProvider;
@@ -11,20 +16,18 @@
 @Configuration
 public class UserProviderConfiguration {
 
-    @Value("${io.insee.dev.k8sonboarding.jwt.username-claim}")
-    private String usernameClaim;
-
-    @Value("${io.insee.dev.k8sonboarding.jwt.groups-claim:groups}")
-    private String groupsClaim;
-
     @Bean
     public UserProvider getUserProvider() {
         return auth -> {
             final User user = new User();
-            final Jwt jwt = (Jwt) auth.getPrincipal();
-            user.setId(jwt.getClaimAsString(usernameClaim));
-            user.setGroups(jwt.getClaimAsStringList(groupsClaim));
-            user.setAuthToken(jwt.getTokenValue());
+            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+            user.setId(authentication.getPrincipal().toString());
+            List<String> roles = authentication.getAuthorities().stream()
+                    .map(GrantedAuthority::getAuthority)
+                    .map(role -> role.replace("ROLE_", ""))
+                    .collect(Collectors.toList());
+            user.setGroups(roles);
+            user.setAuthToken(((Jwt) auth.getPrincipal()).getTokenValue());
             return user;
         };
     }

src/main/java/io/insee/dev/k8sonboarding/configuration/properties/ClusterProperties.java

@@ -3,13 +3,10 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
-
-
 @Configuration
-@ConfigurationProperties(prefix="io.insee.dev.k8sonboarding")
+@ConfigurationProperties(prefix = "io.insee.dev.k8sonboarding")
 public class ClusterProperties {
-  
+
   private String namespacePrefix;
   private String namespaceGroupPrefix;
   private String userPrefix;
@@ -22,21 +19,23 @@ public class ClusterProperties {
   public void setNamespacePrefix(String namespacePrefix) {
     this.namespacePrefix = namespacePrefix;
   }
- 
+
   public String getNameNamespaceAdmin() {
     return nameNamespaceAdmin;
   }
+
   public void setNameNamespaceAdmin(String nameNamespaceAdmin) {
     this.nameNamespaceAdmin = nameNamespaceAdmin;
   }
-  
+
   public String getNamespacePrefix() {
     return namespacePrefix;
   }
 
   public String getApiserverUrl() {
     return apiserverUrl;
   }
+
   public void setApiserverUrl(String apiserverUrl) {
     this.apiserverUrl = apiserverUrl;
   }

src/main/java/io/insee/dev/k8sonboarding/configuration/security/CorsFilterConfiguration.java

@@ -0,0 +1,29 @@
+package io.insee.dev.k8sonboarding.configuration.security;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+
+@Configuration
+public class CorsFilterConfiguration {
+
+    @Value("${io.insee.dev.k8sonboarding.authorized.urls:*}")
+    private String[] urls;
+
+    @Bean
+    public CorsConfigurationSource corsConfigurationSource() {
+        CorsConfiguration configuration = new CorsConfiguration();
+        configuration.setAllowedOriginPatterns(List.of(urls));
+        configuration.setAllowedMethods(List.of("*"));
+        configuration.setAllowedHeaders(List.of("*"));
+        configuration.setMaxAge(3600L);
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", configuration);
+        return source;
+    }
+}