Merge pull request #23 from st-yclee/main

k8s dto 수정 및 kube-client 버전 수정
m-cmp · Sep 6, 2024 · 12d4af7 · 12d4af7
2 parents 21cb36a + 7c0287b
commit 12d4af7
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -94,10 +94,9 @@ dependencies {
 
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation 'org.apache.commons:commons-compress'
-    implementation 'io.kubernetes:client-java'
-    implementation 'io.kubernetes:client-java-api'
-    implementation 'io.kubernetes:client-java-api'
-    implementation 'io.kubernetes:client-java-extended'
+    implementation 'io.kubernetes:client-java:20.0.0'
+    implementation 'io.kubernetes:client-java-api:20.0.0'
+    implementation 'io.kubernetes:client-java-extended:20.0.0'
 
 
 }

diff --git a/src/main/java/kr/co/mcmp/api/manifest/k8s/K8SConfigMapDto.java b/src/main/java/kr/co/mcmp/api/manifest/k8s/K8SConfigMapDto.java
@@ -25,6 +25,6 @@ public class K8SConfigMapDto {
     public static class MetadataDto {
         private String name;
         private String namespace;
-        private Map<String, Object> labels = null;
+        private Map<String, String> labels = null;
     }
 }
diff --git a/src/main/java/kr/co/mcmp/api/manifest/k8s/K8SDeploymentsDto.java b/src/main/java/kr/co/mcmp/api/manifest/k8s/K8SDeploymentsDto.java
@@ -26,7 +26,7 @@ public class K8SDeploymentsDto {
     public static class MetadataDto {
         private String name;
         private String namespace;
-        private Map<String, Object> labels = null;
+        private Map<String, String> labels = null;
     }
 
     @Getter
@@ -43,7 +43,7 @@ public static class SpecDto {
         @NoArgsConstructor
         @AllArgsConstructor
         public static class SelectorDto {
-            private Map<String, Object> matchLabels = null;
+            private Map<String, String> matchLabels = null;
         }
 
         @Getter
@@ -68,8 +68,18 @@ public static class PodSpecDto {
                 public static class ContainerDto {
                     private String name;
                     private String image;
+                    private List<EnvDto> env = null;
                     private List<PortDto> ports = null;
 
+                    @Getter
+                    @Builder
+                    @NoArgsConstructor
+                    @AllArgsConstructor
+                    public static class EnvDto {
+                        private String name;
+                        private String value;
+                    }
+
                     @Getter
                     @Builder
                     @NoArgsConstructor

diff --git a/src/main/java/kr/co/mcmp/api/manifest/k8s/K8SHpaDto.java b/src/main/java/kr/co/mcmp/api/manifest/k8s/K8SHpaDto.java
@@ -25,7 +25,7 @@ public class K8SHpaDto {
     public static class MetadataDto {
         private String name;
         private String namespace;
-        private Map<String, Object> labels = null;
+        private Map<String, String> labels = null;
     }
 
     @Getter

diff --git a/src/main/java/kr/co/mcmp/api/manifest/k8s/K8SPodDto.java b/src/main/java/kr/co/mcmp/api/manifest/k8s/K8SPodDto.java
@@ -26,7 +26,7 @@ public class K8SPodDto {
     public static class MetadataDto {
         private String name;
         private String namespace;
-        private Map<String, Object> labels = null;
+        private Map<String, String> labels = null;
     }
 
     @Getter
@@ -44,9 +44,19 @@ public static class SpecDto {
         public static class ContainerDto {
             private String name;
             private String image;
+            private List<EnvDto> env = null;
             private List<PortDto> ports = null;
             private ResourceDto resources;
 
+            @Getter
+            @Builder
+            @NoArgsConstructor
+            @AllArgsConstructor
+            public static class EnvDto {
+                private String name;
+                private String value;
+            }
+
             @Getter
             @Builder
             @NoArgsConstructor
@@ -63,8 +73,8 @@ public static class PortDto {
             @NoArgsConstructor
             @AllArgsConstructor
             public static class ResourceDto {
-                private Map<String, Object> limits = null;
-                private Map<String, Object> requests = null;
+                private Map<String, String> limits = null;
+                private Map<String, String> requests = null;
             }
         }
     }

diff --git a/src/main/java/kr/co/mcmp/api/manifest/k8s/K8SServiceDto.java b/src/main/java/kr/co/mcmp/api/manifest/k8s/K8SServiceDto.java
@@ -26,15 +26,15 @@ public class K8SServiceDto {
     public static class MetadataDto {
         private String name;
         private String namespace;
-        private Map<String, Object> labels = null;
+        private Map<String, String> labels = null;
     }
 
     @Getter
     @Builder
     @NoArgsConstructor
     @AllArgsConstructor
     public static class SpecDto {
-        private Map<String, Object> selector = null;
+        private Map<String, String> selector = null;
         private List<PortsDto> ports = null;
         private String type;