Bumpup kubernetes client from 4.7.1 to 5.0.0 (support up to kubernetes 1.19)
Change-Id: I7555325fd5eee5bbbb7a0a7a5c27bfc2c333fc7f
diff --git a/apps/k8s-networking/BUILD b/apps/k8s-networking/BUILD
index 9729e56..a4c4f0e 100644
--- a/apps/k8s-networking/BUILD
+++ b/apps/k8s-networking/BUILD
@@ -6,6 +6,26 @@
"@json//jar",
"@k8s_client//jar",
"@k8s_model//jar",
+ "@k8s_model_common//jar",
+ "@k8s_model_core//jar",
+ "@k8s_model_rbac//jar",
+ "@k8s_model_apps//jar",
+ "@k8s_model_admissionregistration//jar",
+ "@k8s_model_apiextensions//jar",
+ "@k8s_model_batch//jar",
+ "@k8s_model_certificates//jar",
+ "@k8s_model_coordination//jar",
+ "@k8s_model_discovery//jar",
+ "@k8s_model_metrics//jar",
+ "@k8s_model_scheduling//jar",
+ "@k8s_model_settings//jar",
+ "@k8s_model_storageclass//jar",
+ "@k8s_model_autoscaling//jar",
+ "@k8s_model_events//jar",
+ "@k8s_model_extensions//jar",
+ "@k8s_model_networking//jar",
+ "@k8s_model_node//jar",
+ "@k8s_model_policy//jar",
"@okhttp//jar",
"@okio//jar",
"@logging_interceptor//jar",
diff --git a/apps/k8s-networking/api/BUILD b/apps/k8s-networking/api/BUILD
index e1e477c..e9ba8dd 100644
--- a/apps/k8s-networking/api/BUILD
+++ b/apps/k8s-networking/api/BUILD
@@ -1,6 +1,26 @@
COMPILE_DEPS = CORE_DEPS + [
"@k8s_client//jar",
"@k8s_model//jar",
+ "@k8s_model_common//jar",
+ "@k8s_model_core//jar",
+ "@k8s_model_rbac//jar",
+ "@k8s_model_apps//jar",
+ "@k8s_model_admissionregistration//jar",
+ "@k8s_model_apiextensions//jar",
+ "@k8s_model_batch//jar",
+ "@k8s_model_certificates//jar",
+ "@k8s_model_coordination//jar",
+ "@k8s_model_discovery//jar",
+ "@k8s_model_metrics//jar",
+ "@k8s_model_scheduling//jar",
+ "@k8s_model_settings//jar",
+ "@k8s_model_storageclass//jar",
+ "@k8s_model_autoscaling//jar",
+ "@k8s_model_events//jar",
+ "@k8s_model_extensions//jar",
+ "@k8s_model_networking//jar",
+ "@k8s_model_node//jar",
+ "@k8s_model_policy//jar",
"@okhttp//jar",
"@okio//jar",
"@logging_interceptor//jar",
diff --git a/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyAdminService.java b/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyAdminService.java
index 2c5bb48..1e87322 100644
--- a/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyAdminService.java
+++ b/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyAdminService.java
@@ -15,7 +15,8 @@
*/
package org.onosproject.k8snetworking.api;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicy;
+
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
/**
* Service for administering the inventory of kubernetes network policy.
diff --git a/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyEvent.java b/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyEvent.java
index 28c502f..5731cf3 100644
--- a/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyEvent.java
+++ b/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyEvent.java
@@ -15,7 +15,7 @@
*/
package org.onosproject.k8snetworking.api;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicy;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
import org.onosproject.event.AbstractEvent;
/**
diff --git a/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyService.java b/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyService.java
index 5c3e572..c5d9957 100644
--- a/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyService.java
+++ b/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyService.java
@@ -15,7 +15,7 @@
*/
package org.onosproject.k8snetworking.api;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicy;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
import org.onosproject.event.ListenerService;
import java.util.Set;
diff --git a/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyStore.java b/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyStore.java
index c6250ae..e283c37 100644
--- a/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyStore.java
+++ b/apps/k8s-networking/api/src/main/java/org/onosproject/k8snetworking/api/K8sNetworkPolicyStore.java
@@ -15,7 +15,7 @@
*/
package org.onosproject.k8snetworking.api;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicy;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
import org.onosproject.store.Store;
import java.util.Set;
diff --git a/apps/k8s-networking/app/BUILD b/apps/k8s-networking/app/BUILD
index 87c974e..5193826 100644
--- a/apps/k8s-networking/app/BUILD
+++ b/apps/k8s-networking/app/BUILD
@@ -9,6 +9,26 @@
"@json//jar",
"@k8s_client//jar",
"@k8s_model//jar",
+ "@k8s_model_common//jar",
+ "@k8s_model_core//jar",
+ "@k8s_model_rbac//jar",
+ "@k8s_model_apps//jar",
+ "@k8s_model_admissionregistration//jar",
+ "@k8s_model_apiextensions//jar",
+ "@k8s_model_batch//jar",
+ "@k8s_model_certificates//jar",
+ "@k8s_model_coordination//jar",
+ "@k8s_model_discovery//jar",
+ "@k8s_model_metrics//jar",
+ "@k8s_model_scheduling//jar",
+ "@k8s_model_settings//jar",
+ "@k8s_model_storageclass//jar",
+ "@k8s_model_autoscaling//jar",
+ "@k8s_model_events//jar",
+ "@k8s_model_extensions//jar",
+ "@k8s_model_networking//jar",
+ "@k8s_model_node//jar",
+ "@k8s_model_policy//jar",
"@okhttp//jar",
"@okio//jar",
"@logging_interceptor//jar",
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNetworkPolicyListCommand.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNetworkPolicyListCommand.java
index ffc76d7..f86db47 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNetworkPolicyListCommand.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNetworkPolicyListCommand.java
@@ -20,7 +20,7 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicy;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
import io.fabric8.kubernetes.client.utils.Serialization;
import org.apache.commons.lang.StringUtils;
import org.apache.karaf.shell.api.action.Command;
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sSyncStateCommand.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sSyncStateCommand.java
index a466e14..843c2f8 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sSyncStateCommand.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sSyncStateCommand.java
@@ -21,7 +21,7 @@
import io.fabric8.kubernetes.api.model.Namespace;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.extensions.Ingress;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicy;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.apache.commons.lang.StringUtils;
import org.apache.karaf.shell.api.action.Command;
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/DistributedK8sNetworkPolicyStore.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/DistributedK8sNetworkPolicyStore.java
index 69c522a..c917f90 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/DistributedK8sNetworkPolicyStore.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/DistributedK8sNetworkPolicyStore.java
@@ -22,13 +22,13 @@
import io.fabric8.kubernetes.api.model.LabelSelectorRequirement;
import io.fabric8.kubernetes.api.model.ManagedFieldsEntry;
import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.networking.IPBlock;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicy;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicyEgressRule;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicyIngressRule;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicyPeer;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicyPort;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicySpec;
+import io.fabric8.kubernetes.api.model.networking.v1.IPBlock;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyEgressRule;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyIngressRule;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeer;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPort;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicySpec;
import org.onlab.util.KryoNamespace;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sEndpointsWatcher.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sEndpointsWatcher.java
index 62c15e6..88d8c51 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sEndpointsWatcher.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sEndpointsWatcher.java
@@ -17,8 +17,8 @@
import io.fabric8.kubernetes.api.model.Endpoints;
import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipService;
import org.onosproject.cluster.NodeId;
@@ -158,7 +158,11 @@
}
@Override
- public void onClose(KubernetesClientException e) {
+ public void onClose() {
+ }
+
+ @Override
+ public void onClose(WatcherException e) {
log.warn("Endpoints watcher OnClose", e);
}
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sIngressWatcher.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sIngressWatcher.java
index 2373713..236dd1c 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sIngressWatcher.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sIngressWatcher.java
@@ -17,8 +17,8 @@
import io.fabric8.kubernetes.api.model.extensions.Ingress;
import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipService;
import org.onosproject.cluster.NodeId;
@@ -158,7 +158,7 @@
}
@Override
- public void onClose(KubernetesClientException e) {
+ public void onClose(WatcherException e) {
log.warn("Ingress watcher OnClose", e);
}
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNamespaceWatcher.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNamespaceWatcher.java
index 1ce7f9f..fbd51a8 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNamespaceWatcher.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNamespaceWatcher.java
@@ -17,8 +17,8 @@
import io.fabric8.kubernetes.api.model.Namespace;
import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipService;
import org.onosproject.cluster.NodeId;
@@ -159,7 +159,7 @@
}
@Override
- public void onClose(KubernetesClientException e) {
+ public void onClose(WatcherException e) {
log.warn("Namespace watcher OnClose", e);
}
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyHandler.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyHandler.java
index 7125d06..ba54000 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyHandler.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyHandler.java
@@ -22,11 +22,12 @@
import io.fabric8.kubernetes.api.model.Namespace;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicy;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicyEgressRule;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicyIngressRule;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicyPeer;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicyPort;
+
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyEgressRule;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyIngressRule;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeer;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPort;
import org.onlab.packet.IPv4;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyManager.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyManager.java
index 8f43afd..c7b4e70 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyManager.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyManager.java
@@ -17,7 +17,7 @@
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicy;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.event.ListenerRegistry;
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyWatcher.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyWatcher.java
index 3ded560..12fd6a1 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyWatcher.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyWatcher.java
@@ -15,10 +15,10 @@
*/
package org.onosproject.k8snetworking.impl;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicy;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipService;
import org.onosproject.cluster.NodeId;
@@ -160,7 +160,7 @@
}
@Override
- public void onClose(KubernetesClientException e) {
+ public void onClose(WatcherException e) {
log.warn("Network policy watcher OnClose", e);
}
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sPodPortMapper.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sPodPortMapper.java
index dfc77cf..998071d 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sPodPortMapper.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sPodPortMapper.java
@@ -17,6 +17,7 @@
import com.google.common.collect.Maps;
import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipService;
@@ -179,10 +180,11 @@
client.pods().inNamespace(pod.getMetadata().getNamespace())
.withName(pod.getMetadata().getName())
- .edit()
- .editMetadata()
- .addToAnnotations(annotations)
- .endMetadata().done();
+ .edit(r -> new PodBuilder(r)
+ .editMetadata()
+ .addToAnnotations(annotations)
+ .endMetadata().build()
+ );
});
}
}
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sPodWatcher.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sPodWatcher.java
index 1fd1808..cfa9855 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sPodWatcher.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sPodWatcher.java
@@ -17,8 +17,8 @@
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipService;
import org.onosproject.cluster.NodeId;
@@ -156,7 +156,7 @@
}
@Override
- public void onClose(KubernetesClientException e) {
+ public void onClose(WatcherException e) {
log.warn("Pod watcher OnClose", e);
}
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sServiceWatcher.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sServiceWatcher.java
index 489eee3..b4b5da4 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sServiceWatcher.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sServiceWatcher.java
@@ -17,8 +17,8 @@
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipService;
import org.onosproject.cluster.NodeId;
@@ -159,7 +159,7 @@
}
@Override
- public void onClose(KubernetesClientException e) {
+ public void onClose(WatcherException e) {
log.warn("Service watcher OnClose", e);
}
diff --git a/apps/k8s-networking/app/src/test/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyManagerTest.java b/apps/k8s-networking/app/src/test/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyManagerTest.java
index 9642cd2..b3854ba 100644
--- a/apps/k8s-networking/app/src/test/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyManagerTest.java
+++ b/apps/k8s-networking/app/src/test/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyManagerTest.java
@@ -18,7 +18,7 @@
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.MoreExecutors;
import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.networking.NetworkPolicy;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/apps/k8s-node/BUILD b/apps/k8s-node/BUILD
index 96724fb..3eb5494 100644
--- a/apps/k8s-node/BUILD
+++ b/apps/k8s-node/BUILD
@@ -4,6 +4,26 @@
"@commons_net//jar",
"@k8s_client//jar",
"@k8s_model//jar",
+ "@k8s_model_common//jar",
+ "@k8s_model_core//jar",
+ "@k8s_model_rbac//jar",
+ "@k8s_model_apps//jar",
+ "@k8s_model_admissionregistration//jar",
+ "@k8s_model_apiextensions//jar",
+ "@k8s_model_batch//jar",
+ "@k8s_model_certificates//jar",
+ "@k8s_model_coordination//jar",
+ "@k8s_model_discovery//jar",
+ "@k8s_model_metrics//jar",
+ "@k8s_model_scheduling//jar",
+ "@k8s_model_settings//jar",
+ "@k8s_model_storageclass//jar",
+ "@k8s_model_autoscaling//jar",
+ "@k8s_model_events//jar",
+ "@k8s_model_extensions//jar",
+ "@k8s_model_networking//jar",
+ "@k8s_model_node//jar",
+ "@k8s_model_policy//jar",
"@okhttp//jar",
"@okio//jar",
"@logging_interceptor//jar",
diff --git a/apps/k8s-node/app/BUILD b/apps/k8s-node/app/BUILD
index b886139..aba9b4b 100644
--- a/apps/k8s-node/app/BUILD
+++ b/apps/k8s-node/app/BUILD
@@ -5,6 +5,26 @@
"//apps/k8s-node/api:onos-apps-k8s-node-api",
"@k8s_client//jar",
"@k8s_model//jar",
+ "@k8s_model_common//jar",
+ "@k8s_model_core//jar",
+ "@k8s_model_rbac//jar",
+ "@k8s_model_apps//jar",
+ "@k8s_model_admissionregistration//jar",
+ "@k8s_model_apiextensions//jar",
+ "@k8s_model_batch//jar",
+ "@k8s_model_certificates//jar",
+ "@k8s_model_coordination//jar",
+ "@k8s_model_discovery//jar",
+ "@k8s_model_metrics//jar",
+ "@k8s_model_scheduling//jar",
+ "@k8s_model_settings//jar",
+ "@k8s_model_storageclass//jar",
+ "@k8s_model_autoscaling//jar",
+ "@k8s_model_events//jar",
+ "@k8s_model_extensions//jar",
+ "@k8s_model_networking//jar",
+ "@k8s_model_node//jar",
+ "@k8s_model_policy//jar",
"@okhttp//jar",
"@okio//jar",
"@logging_interceptor//jar",
diff --git a/apps/kubevirt-networking/BUILD b/apps/kubevirt-networking/BUILD
index 4dfceee..bdf8b8c 100644
--- a/apps/kubevirt-networking/BUILD
+++ b/apps/kubevirt-networking/BUILD
@@ -7,10 +7,31 @@
"@json//jar",
"@k8s_client//jar",
"@k8s_model//jar",
+ "@k8s_model_common//jar",
+ "@k8s_model_core//jar",
+ "@k8s_model_rbac//jar",
+ "@k8s_model_apps//jar",
+ "@k8s_model_admissionregistration//jar",
+ "@k8s_model_apiextensions//jar",
+ "@k8s_model_batch//jar",
+ "@k8s_model_certificates//jar",
+ "@k8s_model_coordination//jar",
+ "@k8s_model_discovery//jar",
+ "@k8s_model_metrics//jar",
+ "@k8s_model_scheduling//jar",
+ "@k8s_model_settings//jar",
+ "@k8s_model_storageclass//jar",
+ "@k8s_model_autoscaling//jar",
+ "@k8s_model_events//jar",
+ "@k8s_model_extensions//jar",
+ "@k8s_model_networking//jar",
+ "@k8s_model_node//jar",
+ "@k8s_model_policy//jar",
"@okhttp//jar",
"@okio//jar",
"@logging_interceptor//jar",
"@jackson_dataformat_yaml//jar",
+ "@jackson_datatype_jsr310//jar",
"@snakeyaml//jar",
"@zjsonpatch//jar",
"@validation_api//jar",
diff --git a/apps/kubevirt-networking/api/BUILD b/apps/kubevirt-networking/api/BUILD
index 3f1c431..b3aa0bd 100644
--- a/apps/kubevirt-networking/api/BUILD
+++ b/apps/kubevirt-networking/api/BUILD
@@ -1,11 +1,32 @@
COMPILE_DEPS = CORE_DEPS + [
"@k8s_client//jar",
"@k8s_model//jar",
+ "@k8s_model_common//jar",
+ "@k8s_model_core//jar",
+ "@k8s_model_rbac//jar",
+ "@k8s_model_apps//jar",
+ "@k8s_model_admissionregistration//jar",
+ "@k8s_model_apiextensions//jar",
+ "@k8s_model_batch//jar",
+ "@k8s_model_certificates//jar",
+ "@k8s_model_coordination//jar",
+ "@k8s_model_discovery//jar",
+ "@k8s_model_metrics//jar",
+ "@k8s_model_scheduling//jar",
+ "@k8s_model_settings//jar",
+ "@k8s_model_storageclass//jar",
+ "@k8s_model_autoscaling//jar",
+ "@k8s_model_events//jar",
+ "@k8s_model_extensions//jar",
+ "@k8s_model_networking//jar",
+ "@k8s_model_node//jar",
+ "@k8s_model_policy//jar",
"@ipaddress//jar",
"@okhttp//jar",
"@okio//jar",
"@logging_interceptor//jar",
"@jackson_dataformat_yaml//jar",
+ "@jackson_datatype_jsr310//jar",
"@snakeyaml//jar",
"@commons_net//jar",
]
diff --git a/apps/kubevirt-networking/app/BUILD b/apps/kubevirt-networking/app/BUILD
index 75b5b42..6bdd6ec 100644
--- a/apps/kubevirt-networking/app/BUILD
+++ b/apps/kubevirt-networking/app/BUILD
@@ -9,10 +9,31 @@
"@json//jar",
"@k8s_client//jar",
"@k8s_model//jar",
+ "@k8s_model_common//jar",
+ "@k8s_model_core//jar",
+ "@k8s_model_rbac//jar",
+ "@k8s_model_apps//jar",
+ "@k8s_model_admissionregistration//jar",
+ "@k8s_model_apiextensions//jar",
+ "@k8s_model_batch//jar",
+ "@k8s_model_certificates//jar",
+ "@k8s_model_coordination//jar",
+ "@k8s_model_discovery//jar",
+ "@k8s_model_metrics//jar",
+ "@k8s_model_scheduling//jar",
+ "@k8s_model_settings//jar",
+ "@k8s_model_storageclass//jar",
+ "@k8s_model_autoscaling//jar",
+ "@k8s_model_events//jar",
+ "@k8s_model_extensions//jar",
+ "@k8s_model_networking//jar",
+ "@k8s_model_node//jar",
+ "@k8s_model_policy//jar",
"@okhttp//jar",
"@okio//jar",
"@logging_interceptor//jar",
"@jackson_dataformat_yaml//jar",
+ "@jackson_datatype_jsr310//jar",
"@snakeyaml//jar",
"@zjsonpatch//jar",
"@validation_api//jar",
diff --git a/apps/kubevirt-node/BUILD b/apps/kubevirt-node/BUILD
index c0fb377..633bea2 100644
--- a/apps/kubevirt-node/BUILD
+++ b/apps/kubevirt-node/BUILD
@@ -4,10 +4,31 @@
"@commons_net//jar",
"@k8s_client//jar",
"@k8s_model//jar",
+ "@k8s_model_common//jar",
+ "@k8s_model_core//jar",
+ "@k8s_model_rbac//jar",
+ "@k8s_model_apps//jar",
+ "@k8s_model_admissionregistration//jar",
+ "@k8s_model_apiextensions//jar",
+ "@k8s_model_batch//jar",
+ "@k8s_model_certificates//jar",
+ "@k8s_model_coordination//jar",
+ "@k8s_model_discovery//jar",
+ "@k8s_model_metrics//jar",
+ "@k8s_model_scheduling//jar",
+ "@k8s_model_settings//jar",
+ "@k8s_model_storageclass//jar",
+ "@k8s_model_autoscaling//jar",
+ "@k8s_model_events//jar",
+ "@k8s_model_extensions//jar",
+ "@k8s_model_networking//jar",
+ "@k8s_model_node//jar",
+ "@k8s_model_policy//jar",
"@okhttp//jar",
"@okio//jar",
"@logging_interceptor//jar",
"@jackson_dataformat_yaml//jar",
+ "@jackson_datatype_jsr310//jar",
"@snakeyaml//jar",
]
diff --git a/apps/kubevirt-node/app/BUILD b/apps/kubevirt-node/app/BUILD
index 372831d..ffb35e5 100644
--- a/apps/kubevirt-node/app/BUILD
+++ b/apps/kubevirt-node/app/BUILD
@@ -5,10 +5,31 @@
"//apps/kubevirt-node/api:onos-apps-kubevirt-node-api",
"@k8s_client//jar",
"@k8s_model//jar",
+ "@k8s_model_common//jar",
+ "@k8s_model_core//jar",
+ "@k8s_model_rbac//jar",
+ "@k8s_model_apps//jar",
+ "@k8s_model_admissionregistration//jar",
+ "@k8s_model_apiextensions//jar",
+ "@k8s_model_batch//jar",
+ "@k8s_model_certificates//jar",
+ "@k8s_model_coordination//jar",
+ "@k8s_model_discovery//jar",
+ "@k8s_model_metrics//jar",
+ "@k8s_model_scheduling//jar",
+ "@k8s_model_settings//jar",
+ "@k8s_model_storageclass//jar",
+ "@k8s_model_autoscaling//jar",
+ "@k8s_model_events//jar",
+ "@k8s_model_extensions//jar",
+ "@k8s_model_networking//jar",
+ "@k8s_model_node//jar",
+ "@k8s_model_policy//jar",
"@okhttp//jar",
"@okio//jar",
"@logging_interceptor//jar",
"@jackson_dataformat_yaml//jar",
+ "@jackson_datatype_jsr310//jar",
"@snakeyaml//jar",
"@commons_net//jar",
]
diff --git a/deps/deps.json b/deps/deps.json
index e3698bb..edcfa7d 100644
--- a/deps/deps.json
+++ b/deps/deps.json
@@ -178,10 +178,18 @@
"moshi": "mvn:com.squareup.moshi:moshi:1.4.0",
"okio": "mvn:com.squareup.okio:okio:1.14.0",
"jacoco-agent-runtime": "mvn:org.jacoco:org.jacoco.agent:jar:runtime:0.8.2",
+<<<<<<< HEAD
"jackson-annotations": "mvn:com.fasterxml.jackson.core:jackson-annotations:2.10.0",
"jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.10.0",
"jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.10.0",
"jackson-dataformat-yaml": "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.0",
+=======
+ "jackson-annotations": "mvn:com.fasterxml.jackson.core:jackson-annotations:2.11.0",
+ "jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.11.0",
+ "jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.11.0",
+ "jackson-datatype-jsr310": "mvn:com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0",
+ "jackson-dataformat-yaml": "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.0",
+>>>>>>> Bumpup kubernetes client from 4.7.1 to 5.0.0 (support up to kubernetes 1.19)
// Note: grpc imports "javax_annotation_api" has an http file, so we need to give a different name here
// See WORKSPACE
@@ -310,11 +318,31 @@
"jackson-coreutils": "mvn:com.github.fge:jackson-coreutils:1.6",
"btf": "mvn:com.github.fge:btf:1.2",
"msg-simple": "mvn:com.github.fge:msg-simple:1.1",
- "snakeyaml": "mvn:org.yaml:snakeyaml:1.25",
+ "snakeyaml": "mvn:org.yaml:snakeyaml:1.26",
// Kubernetes related jars
- "k8s-client": "mvn:io.fabric8:kubernetes-client:4.7.1",
- "k8s-model": "mvn:io.fabric8:kubernetes-model:4.7.1",
+ "k8s-client": "mvn:io.fabric8:kubernetes-client:5.0.0",
+ "k8s-model": "mvn:io.fabric8:kubernetes-model:5.0.0",
+ "k8s-model-common": "mvn:io.fabric8:kubernetes-model-common:5.0.0",
+ "k8s-model-core": "mvn:io.fabric8:kubernetes-model-core:5.0.0",
+ "k8s-model-rbac": "mvn:io.fabric8:kubernetes-model-rbac:5.0.0",
+ "k8s-model-admissionregistration": "mvn:io.fabric8:kubernetes-model-admissionregistration:5.0.0",
+ "k8s-model-apiextensions": "mvn:io.fabric8:kubernetes-model-apiextensions:5.0.0",
+ "k8s-model-batch": "mvn:io.fabric8:kubernetes-model-batch:5.0.0",
+ "k8s-model-certificates": "mvn:io.fabric8:kubernetes-model-certificates:5.0.0",
+ "k8s-model-coordination": "mvn:io.fabric8:kubernetes-model-coordination:5.0.0",
+ "k8s-model-discovery": "mvn:io.fabric8:kubernetes-model-discovery:5.0.0",
+ "k8s-model-metrics": "mvn:io.fabric8:kubernetes-model-metrics:5.0.0",
+ "k8s-model-scheduling": "mvn:io.fabric8:kubernetes-model-scheduling:5.0.0",
+ "k8s-model-settings": "mvn:io.fabric8:kubernetes-model-settings:5.0.0",
+ "k8s-model-storageclass": "mvn:io.fabric8:kubernetes-model-storageclass:5.0.0",
+ "k8s-model-autoscaling": "mvn:io.fabric8:kubernetes-model-autoscaling:5.0.0",
+ "k8s-model-apps": "mvn:io.fabric8:kubernetes-model-apps:5.0.0",
+ "k8s-model-events": "mvn:io.fabric8:kubernetes-model-events:5.0.0",
+ "k8s-model-extensions": "mvn:io.fabric8:kubernetes-model-extensions:5.0.0",
+ "k8s-model-networking": "mvn:io.fabric8:kubernetes-model-networking:5.0.0",
+ "k8s-model-node": "mvn:io.fabric8:kubernetes-model-node:5.0.0",
+ "k8s-model-policy": "mvn:io.fabric8:kubernetes-model-policy:5.0.0",
"zjsonpatch": "mvn:io.fabric8:zjsonpatch:0.3.0",
"generex": "mvn:com.github.mifmif:generex:1.0.2",
"automaton": "mvn:dk.brics.automaton:automaton:1.11-8",
diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index ba444f3..05e83cc 100644
--- a/tools/build/bazel/generate_workspace.bzl
+++ b/tools/build/bazel/generate_workspace.bzl
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Thu, 19 Nov 2020 22:25:03 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Fri, 15 Jan 2021 11:26:29 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -457,27 +457,33 @@
if "jackson_annotations" not in native.existing_rules():
java_import_external(
name = "jackson_annotations",
- jar_sha256 = "77a0846219774a8269bc1b38cc00294908d34e77f8a9da34d97673982f75853d",
+ jar_sha256 = "b3b1fca6cb6469d4ea06635d964aaea91f86cc22fe42a9757c8a315148589e8e",
licenses = ["notice"],
- jar_urls = ["https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.10.0/jackson-annotations-2.10.0.jar"], )
+ jar_urls = ["https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.11.0/jackson-annotations-2.11.0.jar"], )
if "jackson_core" not in native.existing_rules():
java_import_external(
name = "jackson_core",
- jar_sha256 = "69e7695b1e40834fa1242fc328a4010607911ced3706ab79abc769d451197513",
+ jar_sha256 = "b504d81351fb088f1e1bbef6a701faa88d2cfc4350483aeaa19384c39a8133fd",
licenses = ["notice"],
- jar_urls = ["https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.10.0/jackson-core-2.10.0.jar"], )
+ jar_urls = ["https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.0/jackson-core-2.11.0.jar"], )
if "jackson_databind" not in native.existing_rules():
java_import_external(
name = "jackson_databind",
- jar_sha256 = "8e6c566c67fc61a96c5dfc4a71d430f2565765778ec9a6ef216c5460a9911b60",
+ jar_sha256 = "54e72b9fa38fc37986ae7f6fc30ef704eec8010206bcd4d63546dccbbb47f4d1",
licenses = ["notice"],
- jar_urls = ["https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.10.0/jackson-databind-2.10.0.jar"], )
+ jar_urls = ["https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.11.0/jackson-databind-2.11.0.jar"], )
+ if "jackson_datatype_jsr310" not in native.existing_rules():
+ java_import_external(
+ name = "jackson_datatype_jsr310",
+ jar_sha256 = "6805f305f8af285966ffc401c03aaf4ccad84302a1d42b1b2c8b015c4cee5e16",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.11.0/jackson-datatype-jsr310-2.11.0.jar"], )
if "jackson_dataformat_yaml" not in native.existing_rules():
java_import_external(
name = "jackson_dataformat_yaml",
- jar_sha256 = "235cb6f2816d55aa5e8a1c6e37b142cfc2bd5e459aa733820d68e736b6527f7c",
+ jar_sha256 = "99ff346d5d9d6f32a8cc57e26614dfcea9335ac96c62bce4bf112d000239f4a8",
licenses = ["notice"],
- jar_urls = ["https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.10.0/jackson-dataformat-yaml-2.10.0.jar"], )
+ jar_urls = ["https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-yaml/2.11.0/jackson-dataformat-yaml-2.11.0.jar"], )
if "javax_annotation_javax_annotation_api" not in native.existing_rules():
java_import_external(
name = "javax_annotation_javax_annotation_api",
@@ -1189,21 +1195,141 @@
if "snakeyaml" not in native.existing_rules():
java_import_external(
name = "snakeyaml",
- jar_sha256 = "b50ef33187e7dc922b26dbe4dd0fdb3a9cf349e75a08b95269901548eee546eb",
+ jar_sha256 = "d87d607e500885356c03c1cae61e8c2e05d697df8787d5aba13484c2eb76a844",
licenses = ["notice"],
- jar_urls = ["https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.25/snakeyaml-1.25.jar"], )
+ jar_urls = ["https://repo1.maven.org/maven2/org/yaml/snakeyaml/1.26/snakeyaml-1.26.jar"], )
if "k8s_client" not in native.existing_rules():
java_import_external(
name = "k8s_client",
- jar_sha256 = "50addcabb1f4c1be6008c76d491e19f7aa731deaa6eb165dc288454901b23fd8",
+ jar_sha256 = "489ca989f004fdaf95eeeeb0f8e908d735ca6ae88a3e7bc982c337d93af08344",
licenses = ["notice"],
- jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-client/4.7.1/kubernetes-client-4.7.1.jar"], )
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-client/5.0.0/kubernetes-client-5.0.0.jar"], )
if "k8s_model" not in native.existing_rules():
java_import_external(
name = "k8s_model",
- jar_sha256 = "b14ddbc7fb9f6102db5f8b2d9c659cd90caf345d00965e953c79fb66eeb60a11",
+ jar_sha256 = "118f439990a777c9f5bd7f5196f25ae688a8558755027c8df12fead0d314de63",
licenses = ["notice"],
- jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model/4.7.1/kubernetes-model-4.7.1.jar"], )
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model/5.0.0/kubernetes-model-5.0.0.jar"], )
+ if "k8s_model_common" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_common",
+ jar_sha256 = "69e40187f1657a9a22d2a132beb85168cc954e081a7f9135a4950a752573296c",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-common/5.0.0/kubernetes-model-common-5.0.0.jar"], )
+ if "k8s_model_core" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_core",
+ jar_sha256 = "03e0edb9adbc29df2ad26e8fa9a7ff3e7a059fbe2de5ab7bcd9de127932f5ed7",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-core/5.0.0/kubernetes-model-core-5.0.0.jar"], )
+ if "k8s_model_rbac" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_rbac",
+ jar_sha256 = "105ffabc696098954047901a0a30e2a0ea02e7364326f2ff2f74ff9c7a4b6229",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-rbac/5.0.0/kubernetes-model-rbac-5.0.0.jar"], )
+ if "k8s_model_admissionregistration" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_admissionregistration",
+ jar_sha256 = "80afe5364e2d14f73e4f44f4d2db3874895f8c490b36d1d758a5893699ee6e5b",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-admissionregistration/5.0.0/kubernetes-model-admissionregistration-5.0.0.jar"], )
+ if "k8s_model_apiextensions" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_apiextensions",
+ jar_sha256 = "ae5773b4d1169db7f98ddfbc1b1e7498c531c0340fcef5bb9b0c733a99fff70b",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-apiextensions/5.0.0/kubernetes-model-apiextensions-5.0.0.jar"], )
+ if "k8s_model_batch" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_batch",
+ jar_sha256 = "62f7817edc448d744c5272c84a686ee46dd081a716746f44b12d72582b788c27",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-batch/5.0.0/kubernetes-model-batch-5.0.0.jar"], )
+ if "k8s_model_certificates" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_certificates",
+ jar_sha256 = "7f60d3512d8038ed5c48bb4ecae72b3ddff09e4ea75944ef027bb0d9ed01361c",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-certificates/5.0.0/kubernetes-model-certificates-5.0.0.jar"], )
+ if "k8s_model_coordination" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_coordination",
+ jar_sha256 = "dca45bda755127ca763506622478437407ea3f3d60dc78d6f019342a3bd163ca",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-coordination/5.0.0/kubernetes-model-coordination-5.0.0.jar"], )
+ if "k8s_model_discovery" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_discovery",
+ jar_sha256 = "7405895c697c2e1f7c2cbf6e584ad81e67e267e9e139b20e7e60bae58d8b0398",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-discovery/5.0.0/kubernetes-model-discovery-5.0.0.jar"], )
+ if "k8s_model_metrics" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_metrics",
+ jar_sha256 = "b15e728ab07238f2839279c23ad587dfd0f9e9a438c4e074a80b21934e28c976",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-metrics/5.0.0/kubernetes-model-metrics-5.0.0.jar"], )
+ if "k8s_model_scheduling" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_scheduling",
+ jar_sha256 = "d77d04f5525dc3bc2511332acc17e8ca359c6fc057850dc13995d096c7fe8099",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-scheduling/5.0.0/kubernetes-model-scheduling-5.0.0.jar"], )
+ if "k8s_model_settings" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_settings",
+ jar_sha256 = "321dcf83a92de17c2470bf056e0a969518abcbdf911044570f9cd711ad3fefe2",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-settings/5.0.0/kubernetes-model-settings-5.0.0.jar"], )
+ if "k8s_model_storageclass" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_storageclass",
+ jar_sha256 = "ebee1d8867f3311f0a84a34d6e39ca2f3af9d558c60111aa103a510151fb0111",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-storageclass/5.0.0/kubernetes-model-storageclass-5.0.0.jar"], )
+ if "k8s_model_autoscaling" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_autoscaling",
+ jar_sha256 = "5c5b6e884ba7b01e780baf533a1af945ea072ea331da786a3d3941f2ad6c660d",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-autoscaling/5.0.0/kubernetes-model-autoscaling-5.0.0.jar"], )
+ if "k8s_model_apps" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_apps",
+ jar_sha256 = "2c4edfe08a91b1f12287f1a7963c52f6057f290558f910648378f5834ece804f",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-apps/5.0.0/kubernetes-model-apps-5.0.0.jar"], )
+ if "k8s_model_events" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_events",
+ jar_sha256 = "5de9e7f61990608e36886a0a68f6216bbe1d5932464b2e2ef304ab6089da3d79",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-events/5.0.0/kubernetes-model-events-5.0.0.jar"], )
+ if "k8s_model_extensions" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_extensions",
+ jar_sha256 = "c7766b0cf46f2dc3f22910aa7705d74a4b82f9b2a80c10874b6e8c858380d47b",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-extensions/5.0.0/kubernetes-model-extensions-5.0.0.jar"], )
+ if "k8s_model_networking" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_networking",
+ jar_sha256 = "b4c985fca186407b1ca367c76a644015f9b27ce8f11e3e8bcc50b5356b882d2f",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-networking/5.0.0/kubernetes-model-networking-5.0.0.jar"], )
+ if "k8s_model_node" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_node",
+ jar_sha256 = "c350f977715ab4c646037d2d62fe975092ecd52f47f884b8ffa6c3399c7b6d9f",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-node/5.0.0/kubernetes-model-node-5.0.0.jar"], )
+ if "k8s_model_policy" not in native.existing_rules():
+ java_import_external(
+ name = "k8s_model_policy",
+ jar_sha256 = "59dbbb0823e739af6b930c2c4bf72cf18e2e530cb74a67f7896611c03f5633db",
+ licenses = ["notice"],
+ jar_urls = ["https://repo1.maven.org/maven2/io/fabric8/kubernetes-model-policy/5.0.0/kubernetes-model-policy-5.0.0.jar"], )
if "zjsonpatch" not in native.existing_rules():
java_import_external(
name = "zjsonpatch",
@@ -1404,10 +1530,11 @@
artifact_map["@moshi//:moshi"] = "mvn:com.squareup.moshi:moshi:jar:NON-OSGI:1.4.0"
artifact_map["@okio//:okio"] = "mvn:com.squareup.okio:okio:jar:NON-OSGI:1.14.0"
artifact_map["@jacoco_agent_runtime//:jacoco_agent_runtime"] = "mvn:org.jacoco:org.jacoco.agent:jar:runtime:NON-OSGI:0.8.2"
-artifact_map["@jackson_annotations//:jackson_annotations"] = "mvn:com.fasterxml.jackson.core:jackson-annotations:jar:2.10.0"
-artifact_map["@jackson_core//:jackson_core"] = "mvn:com.fasterxml.jackson.core:jackson-core:jar:2.10.0"
-artifact_map["@jackson_databind//:jackson_databind"] = "mvn:com.fasterxml.jackson.core:jackson-databind:jar:2.10.0"
-artifact_map["@jackson_dataformat_yaml//:jackson_dataformat_yaml"] = "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.10.0"
+artifact_map["@jackson_annotations//:jackson_annotations"] = "mvn:com.fasterxml.jackson.core:jackson-annotations:jar:2.11.0"
+artifact_map["@jackson_core//:jackson_core"] = "mvn:com.fasterxml.jackson.core:jackson-core:jar:2.11.0"
+artifact_map["@jackson_databind//:jackson_databind"] = "mvn:com.fasterxml.jackson.core:jackson-databind:jar:2.11.0"
+artifact_map["@jackson_datatype_jsr310//:jackson_datatype_jsr310"] = "mvn:com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.11.0"
+artifact_map["@jackson_dataformat_yaml//:jackson_dataformat_yaml"] = "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.11.0"
artifact_map["@javax_annotation_javax_annotation_api//:javax_annotation_javax_annotation_api"] = "mvn:javax.annotation:javax.annotation-api:jar:1.3"
artifact_map["@javax_inject//:javax_inject"] = "mvn:org.glassfish.hk2.external:javax.inject:jar:2.5.0-b42"
artifact_map["@javax_ws_rs_api//:javax_ws_rs_api"] = "mvn:javax.ws.rs:javax.ws.rs-api:jar:2.1"
@@ -1526,9 +1653,29 @@
artifact_map["@jackson_coreutils//:jackson_coreutils"] = "mvn:com.github.fge:jackson-coreutils:jar:1.6"
artifact_map["@btf//:btf"] = "mvn:com.github.fge:btf:jar:1.2"
artifact_map["@msg_simple//:msg_simple"] = "mvn:com.github.fge:msg-simple:jar:1.1"
-artifact_map["@snakeyaml//:snakeyaml"] = "mvn:org.yaml:snakeyaml:jar:1.25"
-artifact_map["@k8s_client//:k8s_client"] = "mvn:io.fabric8:kubernetes-client:jar:NON-OSGI:4.7.1"
-artifact_map["@k8s_model//:k8s_model"] = "mvn:io.fabric8:kubernetes-model:jar:4.7.1"
+artifact_map["@snakeyaml//:snakeyaml"] = "mvn:org.yaml:snakeyaml:jar:1.26"
+artifact_map["@k8s_client//:k8s_client"] = "mvn:io.fabric8:kubernetes-client:jar:NON-OSGI:5.0.0"
+artifact_map["@k8s_model//:k8s_model"] = "mvn:io.fabric8:kubernetes-model:jar:NON-OSGI:5.0.0"
+artifact_map["@k8s_model_common//:k8s_model_common"] = "mvn:io.fabric8:kubernetes-model-common:jar:5.0.0"
+artifact_map["@k8s_model_core//:k8s_model_core"] = "mvn:io.fabric8:kubernetes-model-core:jar:5.0.0"
+artifact_map["@k8s_model_rbac//:k8s_model_rbac"] = "mvn:io.fabric8:kubernetes-model-rbac:jar:5.0.0"
+artifact_map["@k8s_model_admissionregistration//:k8s_model_admissionregistration"] = "mvn:io.fabric8:kubernetes-model-admissionregistration:jar:5.0.0"
+artifact_map["@k8s_model_apiextensions//:k8s_model_apiextensions"] = "mvn:io.fabric8:kubernetes-model-apiextensions:jar:5.0.0"
+artifact_map["@k8s_model_batch//:k8s_model_batch"] = "mvn:io.fabric8:kubernetes-model-batch:jar:5.0.0"
+artifact_map["@k8s_model_certificates//:k8s_model_certificates"] = "mvn:io.fabric8:kubernetes-model-certificates:jar:5.0.0"
+artifact_map["@k8s_model_coordination//:k8s_model_coordination"] = "mvn:io.fabric8:kubernetes-model-coordination:jar:5.0.0"
+artifact_map["@k8s_model_discovery//:k8s_model_discovery"] = "mvn:io.fabric8:kubernetes-model-discovery:jar:5.0.0"
+artifact_map["@k8s_model_metrics//:k8s_model_metrics"] = "mvn:io.fabric8:kubernetes-model-metrics:jar:5.0.0"
+artifact_map["@k8s_model_scheduling//:k8s_model_scheduling"] = "mvn:io.fabric8:kubernetes-model-scheduling:jar:5.0.0"
+artifact_map["@k8s_model_settings//:k8s_model_settings"] = "mvn:io.fabric8:kubernetes-model-settings:jar:5.0.0"
+artifact_map["@k8s_model_storageclass//:k8s_model_storageclass"] = "mvn:io.fabric8:kubernetes-model-storageclass:jar:5.0.0"
+artifact_map["@k8s_model_autoscaling//:k8s_model_autoscaling"] = "mvn:io.fabric8:kubernetes-model-autoscaling:jar:5.0.0"
+artifact_map["@k8s_model_apps//:k8s_model_apps"] = "mvn:io.fabric8:kubernetes-model-apps:jar:5.0.0"
+artifact_map["@k8s_model_events//:k8s_model_events"] = "mvn:io.fabric8:kubernetes-model-events:jar:5.0.0"
+artifact_map["@k8s_model_extensions//:k8s_model_extensions"] = "mvn:io.fabric8:kubernetes-model-extensions:jar:5.0.0"
+artifact_map["@k8s_model_networking//:k8s_model_networking"] = "mvn:io.fabric8:kubernetes-model-networking:jar:5.0.0"
+artifact_map["@k8s_model_node//:k8s_model_node"] = "mvn:io.fabric8:kubernetes-model-node:jar:5.0.0"
+artifact_map["@k8s_model_policy//:k8s_model_policy"] = "mvn:io.fabric8:kubernetes-model-policy:jar:5.0.0"
artifact_map["@zjsonpatch//:zjsonpatch"] = "mvn:io.fabric8:zjsonpatch:jar:0.3.0"
artifact_map["@generex//:generex"] = "mvn:com.github.mifmif:generex:jar:NON-OSGI:1.0.2"
artifact_map["@automaton//:automaton"] = "mvn:dk.brics.automaton:automaton:jar:NON-OSGI:1.11-8"