resolve conflict

2020-06-15 02:59:15 +09:00
parent c9472ad4b6 ce768c84b7
commit 298382169c
2451 changed files with 127381 additions and 564546 deletions
@@ -28,4 +28,4 @@ spec:
            name: example-config
            key: example.property.2
  nodeSelector:
-    beta.kubernetes.io/os: windows
+    kubernetes.io/os: windows
@@ -17,5 +17,5 @@ spec:
      - name: foo
        image: microsoft/windowsservercore:1709
      nodeSelector:
-        beta.kubernetes.io/os: windows
+        kubernetes.io/os: windows

@@ -17,4 +17,4 @@ spec:
  - name: scratch-volume
    emptyDir: {}
  nodeSelector:
-    beta.kubernetes.io/os: windows
+    kubernetes.io/os: windows
@@ -11,7 +11,7 @@ spec:
      mountPath: "C:\\etc\\foo"
      readOnly: true
  nodeSelector:
-    beta.kubernetes.io/os: windows
+    kubernetes.io/os: windows
  volumes:
  - name: foo
    hostPath:
@@ -29,4 +29,4 @@ spec:
            name: mysecret
            key: password
  nodeSelector:
-    beta.kubernetes.io/os: windows
+    kubernetes.io/os: windows