fix: Invalid OpenAPI Spec (Issue 4817)

Signed-off-by: Kenny Trytek <kenneth.g.trytek@gmail.com>
argoproj · Feb 14, 2021 · 9512e78 · 9512e78
1 parent a50ddb2
commit 9512e78
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 23 deletions.
diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json
@@ -8636,10 +8636,7 @@
       "type": "string"
     },
     "io.k8s.apimachinery.pkg.util.intstr.IntOrString": {
-      "type": [
-        "string",
-        "integer"
-      ]
+      "type": "string"
     },
     "sensor.CreateSensorRequest": {
       "properties": {

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -12044,10 +12044,7 @@
       "format": "date-time"
     },
     "io.k8s.apimachinery.pkg.util.intstr.IntOrString": {
-      "type": [
-        "string",
-        "integer"
-      ]
+      "type": "string"
     },
     "sensor.CreateSensorRequest": {
       "type": "object",

diff --git a/examples/daemon-nginx.yaml b/examples/daemon-nginx.yaml
@@ -24,7 +24,7 @@ spec:
       readinessProbe:
         httpGet:
           path: /
-          port: 80
+          port: "80"
         initialDelaySeconds: 2
         timeoutSeconds: 1
 

diff --git a/examples/daemon-step.yaml b/examples/daemon-step.yaml
@@ -50,7 +50,7 @@ spec:
       readinessProbe:
         httpGet:
           path: /ping
-          port: 8086
+          port: "8086"
         initialDelaySeconds: 5
         timeoutSeconds: 1
 

diff --git a/examples/dag-daemon-task.yaml b/examples/dag-daemon-task.yaml
@@ -59,7 +59,7 @@ spec:
       readinessProbe:
         httpGet:
           path: /ping
-          port: 8086
+          port: "8086"
         initialDelaySeconds: 5
         timeoutSeconds: 1
 

diff --git a/examples/dag-disable-failFast.yaml b/examples/dag-disable-failFast.yaml
@@ -12,14 +12,14 @@ spec:
       args: ["hello world"]
   - name: b
     retryStrategy:
-      limit: 2
+      limit: "2"
     container:
       image: alpine:latest
       command: [sh, -c]
       args: ["sleep 30; echo haha"]
   - name: c
     retryStrategy:
-      limit: 3
+      limit: "3"
     container:
       image: alpine:latest
       command: [sh, -c]
@@ -46,4 +46,4 @@ spec:
         template: d
       - name: E
         dependencies: [D]
-        template: d
+        template: d
diff --git a/examples/default-pdb-support.yaml b/examples/default-pdb-support.yaml
@@ -7,7 +7,7 @@ spec:
   entrypoint: pdbcreate
   serviceAccountName: default
   podDisruptionBudget:
-    minAvailable: 9999   # Provide arbitrary big number if you don't know how many pods workflow creates
+    minAvailable: "9999"   # Provide arbitrary big number if you don't know how many pods workflow creates
   templates:
   - name: pdbcreate
     container:

diff --git a/examples/influxdb-ci.yaml b/examples/influxdb-ci.yaml
@@ -203,7 +203,7 @@ spec:
       readinessProbe:
         httpGet:
           path: /ping
-          port: 8086
+          port: "8086"
         initialDelaySeconds: 5
         timeoutSeconds: 1
       command: ["/bin/sh", "-c"]

diff --git a/examples/retry-backoff.yaml b/examples/retry-backoff.yaml
@@ -8,10 +8,10 @@ spec:
   templates:
   - name: retry-backoff
     retryStrategy:
-      limit: 10
+      limit: "10"
       backoff:
         duration: "1"       # Must be a string. Default unit is seconds. Could also be a Duration, e.g.: "2m", "6h", "1d"
-        factor: 2
+        factor: "2"
         maxDuration: "1m" # Must be a string. Default unit is seconds. Could also be a Duration, e.g.: "2m", "6h", "1d"
     container:
       image: python:alpine3.6

diff --git a/examples/retry-container.yaml b/examples/retry-container.yaml
@@ -8,7 +8,7 @@ spec:
   templates:
   - name: retry-container
     retryStrategy:
-      limit: 10
+      limit: "10"
     container:
       image: python:alpine3.6
       command: ["python", -c]

diff --git a/examples/retry-on-error.yaml b/examples/retry-on-error.yaml
@@ -8,7 +8,7 @@ spec:
   templates:
   - name: error-container
     retryStrategy:
-      limit: 2
+      limit: "2"
       retryPolicy: "Always"   # Retry on errors AND failures. Also available: "OnFailure" (default), "OnError"
     container:
       image: python

diff --git a/examples/retry-script.yaml b/examples/retry-script.yaml
@@ -8,7 +8,7 @@ spec:
   templates:
   - name: retry-script
     retryStrategy:
-      limit: 10
+      limit: "10"
     script:
       image: python:alpine3.6
       command: ["python"]

diff --git a/examples/retry-with-steps.yaml b/examples/retry-with-steps.yaml
@@ -16,7 +16,7 @@ spec:
         template: random-fail
   - name: random-fail
     retryStrategy:
-      limit: 10
+      limit: "10"
     container:
       image: python:alpine3.6
       command: [python, -c]

diff --git a/hack/swagger/kubeifyswagger.go b/hack/swagger/kubeifyswagger.go
@@ -59,7 +59,7 @@ func kubeifySwagger(in, out string) {
 		}
 	}
 
-	definitions["io.k8s.apimachinery.pkg.util.intstr.IntOrString"] = obj{"type": array{"string", "integer"}}
+	definitions["io.k8s.apimachinery.pkg.util.intstr.IntOrString"] = obj{"type": "string"}
 	// "omitempty" does not work for non-nil structs, so we must change it here
 	definitions["io.argoproj.workflow.v1alpha1.CronWorkflow"].(obj)["required"] = array{"metadata", "spec"}
 	definitions["io.argoproj.workflow.v1alpha1.Workflow"].(obj)["required"] = array{"metadata", "spec"}