Update examples to ExistingInfra* using crdconv

Signed-off-by: Dennis Marttinen <dennis@weave.works>
weaveworks · Jul 28, 2020 · f426bd3 · f426bd3
1 parent 48491db
commit f426bd3
Show file tree

Hide file tree

Showing 7 changed files with 296 additions and 232 deletions.
diff --git a/environments/local-rpm-repo/README.md b/environments/local-rpm-repo/README.md
@@ -45,8 +45,8 @@
 5. Configure it in your `cluster.yaml`:
 
     ```yaml
-    apiVersion: "cluster.weave.works/v1alpha3"
-    kind: "BareMetalCluster"
+    apiVersion: cluster.weave.works/v1alpha3
+    kind: ExistingInfraCluster
     spec:
       os:
         files:

diff --git a/examples/footloose/cluster.yaml b/examples/footloose/cluster.yaml
@@ -1,35 +1,41 @@
-apiVersion: cluster.k8s.io/v1alpha1
+apiVersion: cluster.x-k8s.io/v1alpha3
 kind: Cluster
 metadata:
   name: example
 spec:
   clusterNetwork:
-    services:
-      cidrBlocks: [10.96.0.0/12]
     pods:
-      cidrBlocks: [192.168.0.0/16]
-    serviceDomain: cluster.local
-  providerSpec:
-    value:
-      apiVersion: baremetalproviderspec/v1alpha1
-      kind: BareMetalClusterProviderSpec
-      user: root
-      os:
-        files:
-        - source:
-            configmap: repo
-            key: kubernetes.repo
-          destination: /etc/yum.repos.d/kubernetes.repo
-        - source:
-            configmap: repo
-            key: docker-ce.repo
-          destination: /etc/yum.repos.d/docker-ce.repo
-        - source:
-            configmap: repo
-            key: cloud-google-com.gpg.b64
-          destination: /tmp/cloud-google-com.gpg.b64
-      cri:
-        kind: docker
-        package: docker-ce
-        version: 19.03.8
-
+      cidrBlocks:
+      - 192.168.0.0/16
+    services:
+      cidrBlocks:
+      - 10.96.0.0/12
+  infrastructureRef:
+    apiVersion: cluster.weave.works/v1alpha3
+    kind: ExistingInfraCluster
+    name: example-provider
+---
+apiVersion: cluster.weave.works/v1alpha3
+kind: ExistingInfraCluster
+metadata:
+  name: example-provider
+spec:
+  cri:
+    kind: docker
+    package: docker-ce
+    version: 19.03.8
+  os:
+    files:
+    - destination: /etc/yum.repos.d/kubernetes.repo
+      source:
+        configmap: repo
+        key: kubernetes.repo
+    - destination: /etc/yum.repos.d/docker-ce.repo
+      source:
+        configmap: repo
+        key: docker-ce.repo
+    - destination: /tmp/cloud-google-com.gpg.b64
+      source:
+        configmap: repo
+        key: cloud-google-com.gpg.b64
+  user: root
diff --git a/examples/footloose/machines-multimaster.yaml b/examples/footloose/machines-multimaster.yaml
@@ -1,71 +1,95 @@
-apiVersion: v1
-kind: List
-items:
-- apiVersion: cluster.k8s.io/v1alpha1
-  kind: Machine
-  metadata:
-    name: master-1
-    labels:
-      set: master
-  spec:
-    providerSpec:
-      value:
-        apiVersion: baremetalproviderspec/v1alpha1
-        kind: BareMetalMachineProviderSpec
-        public:
-          address: 127.0.0.1
-          port: 2222
-        private:
-          address: 172.17.0.2
-          port: 22
-- apiVersion: cluster.k8s.io/v1alpha1
-  kind: Machine
-  metadata:
-    name: master-2
-    labels:
-      set: master
-  spec:
-    providerSpec:
-      value:
-        apiVersion: baremetalproviderspec/v1alpha1
-        kind: BareMetalMachineProviderSpec
-        public:
-          address: 127.0.0.1
-          port: 2223
-        private:
-          address: 172.17.0.3
-          port: 22
-- apiVersion: cluster.k8s.io/v1alpha1
-  kind: Machine
-  metadata:
-    name: master-3
-    labels:
-      set: master
-  spec:
-    providerSpec:
-      value:
-        apiVersion: baremetalproviderspec/v1alpha1
-        kind: BareMetalMachineProviderSpec
-        public:
-          address: 127.0.0.1
-          port: 2224
-        private:
-          address: 172.17.0.4
-          port: 22
-- apiVersion: cluster.k8s.io/v1alpha1
-  kind: Machine
-  metadata:
-    name: worker-1
-    labels:
-      set: worker
-  spec:
-    providerSpec:
-      value:
-        apiVersion: baremetalproviderspec/v1alpha1
-        kind: BareMetalMachineProviderSpec
-        public:
-          address: 127.0.0.1
-          port: 2225
-        private:
-          address: 172.17.0.5
-          port: 22
+apiVersion: cluster.x-k8s.io/v1alpha3
+kind: Machine
+metadata:
+  labels:
+    set: master
+  name: master-1
+spec:
+  infrastructureRef:
+    apiVersion: cluster.weave.works/v1alpha3
+    kind: ExistingInfraMachine
+    name: master-1-provider
+---
+apiVersion: cluster.weave.works/v1alpha3
+kind: ExistingInfraMachine
+metadata:
+  name: master-1-provider
+spec:
+  private:
+    address: 172.17.0.2
+    port: 22
+  public:
+    address: 127.0.0.1
+    port: 2222
+---
+apiVersion: cluster.x-k8s.io/v1alpha3
+kind: Machine
+metadata:
+  labels:
+    set: master
+  name: master-2
+spec:
+  infrastructureRef:
+    apiVersion: cluster.weave.works/v1alpha3
+    kind: ExistingInfraMachine
+    name: master-2-provider
+---
+apiVersion: cluster.weave.works/v1alpha3
+kind: ExistingInfraMachine
+metadata:
+  name: master-2-provider
+spec:
+  private:
+    address: 172.17.0.3
+    port: 22
+  public:
+    address: 127.0.0.1
+    port: 2223
+---
+apiVersion: cluster.x-k8s.io/v1alpha3
+kind: Machine
+metadata:
+  labels:
+    set: master
+  name: master-3
+spec:
+  infrastructureRef:
+    apiVersion: cluster.weave.works/v1alpha3
+    kind: ExistingInfraMachine
+    name: master-3-provider
+---
+apiVersion: cluster.weave.works/v1alpha3
+kind: ExistingInfraMachine
+metadata:
+  name: master-3-provider
+spec:
+  private:
+    address: 172.17.0.4
+    port: 22
+  public:
+    address: 127.0.0.1
+    port: 2224
+---
+apiVersion: cluster.x-k8s.io/v1alpha3
+kind: Machine
+metadata:
+  labels:
+    set: worker
+  name: worker-1
+spec:
+  infrastructureRef:
+    apiVersion: cluster.weave.works/v1alpha3
+    kind: ExistingInfraMachine
+    name: worker-1-provider
+---
+apiVersion: cluster.weave.works/v1alpha3
+kind: ExistingInfraMachine
+metadata:
+  name: worker-1-provider
+spec:
+  private:
+    address: 172.17.0.5
+    port: 22
+  public:
+    address: 127.0.0.1
+    port: 2225
diff --git a/examples/footloose/machines.yaml b/examples/footloose/machines.yaml
@@ -1,37 +1,47 @@
-apiVersion: v1
-kind: List
-items:
-- apiVersion: cluster.k8s.io/v1alpha1
-  kind: Machine
-  metadata:
-    name: master-1
-    labels:
-      set: master
-  spec:
-    providerSpec:
-      value:
-        apiVersion: baremetalproviderspec/v1alpha1
-        kind: BareMetalMachineProviderSpec
-        public:
-          address: 127.0.0.1
-          port: 2222
-        private:
-          address: 172.17.0.2
-          port: 22
-- apiVersion: cluster.k8s.io/v1alpha1
-  kind: Machine
-  metadata:
-    name: worker-1
-    labels:
-      set: worker
-  spec:
-    providerSpec:
-      value:
-        apiVersion: baremetalproviderspec/v1alpha1
-        kind: BareMetalMachineProviderSpec
-        public:
-          address: 127.0.0.1
-          port: 2223
-        private:
-          address: 172.17.0.3
-          port: 22
+apiVersion: cluster.x-k8s.io/v1alpha3
+kind: Machine
+metadata:
+  labels:
+    set: master
+  name: master-1
+spec:
+  infrastructureRef:
+    apiVersion: cluster.weave.works/v1alpha3
+    kind: ExistingInfraMachine
+    name: master-1-provider
+---
+apiVersion: cluster.weave.works/v1alpha3
+kind: ExistingInfraMachine
+metadata:
+  name: master-1-provider
+spec:
+  private:
+    address: 172.17.0.2
+    port: 22
+  public:
+    address: 127.0.0.1
+    port: 2222
+---
+apiVersion: cluster.x-k8s.io/v1alpha3
+kind: Machine
+metadata:
+  labels:
+    set: worker
+  name: worker-1
+spec:
+  infrastructureRef:
+    apiVersion: cluster.weave.works/v1alpha3
+    kind: ExistingInfraMachine
+    name: worker-1-provider
+---
+apiVersion: cluster.weave.works/v1alpha3
+kind: ExistingInfraMachine
+metadata:
+  name: worker-1-provider
+spec:
+  private:
+    address: 172.17.0.3
+    port: 22
+  public:
+    address: 127.0.0.1
+    port: 2223