diff --git a/build.gradle b/build.gradle index 423c36f..6b9e094 100755 --- 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 index e86866f..10f81ac 100644 --- 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 labels = null; + private Map 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 index 952b903..101ead5 100644 --- 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 labels = null; + private Map labels = null; } @Getter @@ -43,7 +43,7 @@ public static class SpecDto { @NoArgsConstructor @AllArgsConstructor public static class SelectorDto { - private Map matchLabels = null; + private Map matchLabels = null; } @Getter @@ -68,8 +68,18 @@ public static class PodSpecDto { public static class ContainerDto { private String name; private String image; + private List env = null; private List 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 index 95fafea..019ebb6 100644 --- 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 labels = null; + private Map 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 index d2e4c62..7d6c282 100644 --- 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 labels = null; + private Map labels = null; } @Getter @@ -44,9 +44,19 @@ public static class SpecDto { public static class ContainerDto { private String name; private String image; + private List env = null; private List 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 limits = null; - private Map requests = null; + private Map limits = null; + private Map 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 index 8added1..9541271 100644 --- 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,7 +26,7 @@ public class K8SServiceDto { public static class MetadataDto { private String name; private String namespace; - private Map labels = null; + private Map labels = null; } @Getter @@ -34,7 +34,7 @@ public static class MetadataDto { @NoArgsConstructor @AllArgsConstructor public static class SpecDto { - private Map selector = null; + private Map selector = null; private List ports = null; private String type;