Merge pull request #60 from tg123/v1.8

generate from V1.8.4

Author: brendandburns

csharp.settings

@@ -1,3 +1,3 @@
-export KUBERNETES_BRANCH=master
+export KUBERNETES_BRANCH=v1.8.4
 export CLIENT_VERSION=0.0.1
 export PACKAGE_NAME=k8s

examples/namespace/Namespace.cs

@@ -54,7 +54,7 @@ private static void Main(string[] args)
 
             ListNamespaces(client);
 
-            var ns = new Corev1Namespace
+            var ns = new V1Namespace
             {
                 Metadata = new V1ObjectMeta
                 {
@@ -71,7 +71,7 @@ private static void Main(string[] args)
 
             if (status.HasObject)
             {
-                var obj = status.ObjectView<Corev1Namespace>();
+                var obj = status.ObjectView<V1Namespace>();
                 Console.WriteLine(obj.Status.Phase);
 
                 Delete(client, ns.Metadata.Name, 3 * 1000);

examples/simple/PodList.cs

@@ -1,22 +1,23 @@
+using System;
+using k8s;
+
 namespace simple
 {
-    using System;
-    using System.IO;
-    using k8s;
-
-    class PodList
+    internal class PodList
     {
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
-            var k8sClientConfig = KubernetesClientConfiguration.BuildConfigFromConfigFile();
-            IKubernetes client = new Kubernetes(k8sClientConfig);
+            var config = KubernetesClientConfiguration.BuildConfigFromConfigFile();
+            IKubernetes client = new Kubernetes(config);
             Console.WriteLine("Starting Request!");
-            var listTask = client.ListNamespacedPodWithHttpMessagesAsync("default").Result;
-            var list = listTask.Body;
-            foreach (var item in list.Items) {
+
+            var list = client.ListNamespacedPod("default");
+            foreach (var item in list.Items)
+            {
                 Console.WriteLine(item.Metadata.Name);
             }
-            if (list.Items.Count == 0) {
+            if (list.Items.Count == 0)
+            {
                 Console.WriteLine("Empty!");
             }
         }

examples/watch/Program.cs

@@ -14,7 +14,7 @@ private static void Main(string[] args)
             IKubernetes client = new Kubernetes(config);
 
             var podlistResp = client.ListNamespacedPodWithHttpMessagesAsync("default", watch: true).Result;
-            using (podlistResp.Watch<Corev1Pod>((type, item) =>
+            using (podlistResp.Watch<V1Pod>((type, item) =>
             {
                 Console.WriteLine("==on watch event==");
                 Console.WriteLine(type);

src/IntOrString.cs

@@ -0,0 +1,74 @@
+using System;
+using Newtonsoft.Json;
+
+namespace k8s.Models
+{
+    internal class IntOrStringConverter : JsonConverter
+    {
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var s = (value as IntstrIntOrString)?.Value;
+
+            if (int.TryParse(s, out var intv))
+            {
+                serializer.Serialize(writer, intv);
+                return;
+            }
+
+            serializer.Serialize(writer, s);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
+            JsonSerializer serializer)
+        {
+            return (IntstrIntOrString) serializer.Deserialize<string>(reader);
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(int) || objectType == typeof(string);
+        }
+    }
+
+    [JsonConverter(typeof(IntOrStringConverter))]
+    public partial class IntstrIntOrString
+    {
+        public static implicit operator int(IntstrIntOrString v)
+        {
+            return int.Parse(v.Value);
+        }
+
+        public static implicit operator IntstrIntOrString(int v)
+        {
+            return new IntstrIntOrString(Convert.ToString(v));
+        }
+
+        public static implicit operator string(IntstrIntOrString v)
+        {
+            return v.Value;
+        }
+
+        public static implicit operator IntstrIntOrString(string v)
+        {
+            return new IntstrIntOrString(v);
+        }
+
+        protected bool Equals(IntstrIntOrString other)
+        {
+            return string.Equals(Value, other.Value);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((IntstrIntOrString) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return (Value != null ? Value.GetHashCode() : 0);
+        }
+    }
+}