CAPV: Minor fixes. (#1461)

giantswarm · Oct 22, 2024 · c934dda · c934dda
1 parent 277f726
commit c934dda
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -526,11 +526,12 @@ to all Giant Swarm installations.
   - v8.0
     - [v8.0.0](https://github.com/giantswarm/releases/tree/master/kvm/archived/v8.0.0)
 
-## Vsphere
+## vSphere
 
 - v28
   - v28.0
     - [v28.0.0](https://github.com/giantswarm/releases/tree/master/vsphere/v28.0.0)
+
 - v27
   - v27.0
     - [v27.0.0](https://github.com/giantswarm/releases/tree/master/vsphere/v27.0.0)

diff --git a/vsphere/v27.0.0/release.yaml b/vsphere/v27.0.0/release.yaml
@@ -4,8 +4,6 @@ metadata:
   name: vsphere-27.0.0
 spec:
   apps:
-  - name: cloud-provider-vsphere
-    version: 1.11.0
   - name: capi-node-labeler
     version: 0.5.0
   - name: cert-exporter
@@ -26,6 +24,10 @@ spec:
     version: 0.1.2
     dependsOn:
     - prometheus-operator-crd
+  - name: cloud-provider-vsphere
+    version: 1.11.0
+    dependsOn:
+    - cilium
   - name: coredns
     version: 1.21.0
     dependsOn:
@@ -55,8 +57,8 @@ spec:
     dependsOn:
     - prometheus-operator-crd
   - name: network-policies
-    version: 0.1.1
     catalog: cluster
+    version: 0.1.1
     dependsOn:
     - cilium
   - name: node-exporter
@@ -76,8 +78,8 @@ spec:
     dependsOn:
     - prometheus-operator-crd
   - name: security-bundle
-    version: 1.8.0
     catalog: giantswarm
+    version: 1.8.0
     dependsOn:
     - prometheus-operator-crd
   - name: teleport-kube-agent

diff --git a/vsphere/v28.0.0/announcement.md b/vsphere/v28.0.0/announcement.md
@@ -1,3 +1,3 @@
 **Workload cluster release v28.0.0 for vSphere is available**. This release upgrades Kubernetes to v1.28.
 
-Further details can be found in the [release notes](https://docs.giantswarm.io/changes/workload-cluster-releases-azure/releases/vsphere-28.0.0).
+Further details can be found in the [release notes](https://docs.giantswarm.io/changes/workload-cluster-releases-vsphere/releases/vsphere-28.0.0).
diff --git a/vsphere/v28.0.0/release.diff b/vsphere/v28.0.0/release.diff
@@ -4,8 +4,6 @@ metadata:								metadata:
   name: vsphere-27.0.0						|         name: vsphere-28.0.0
 spec:									spec:
   apps:									  apps:
-  - name: cloud-provider-vsphere					  - name: cloud-provider-vsphere
-    version: 1.11.0							    version: 1.11.0
   - name: capi-node-labeler						  - name: capi-node-labeler
     version: 0.5.0							    version: 0.5.0
   - name: cert-exporter							  - name: cert-exporter
@@ -26,6 +24,10 @@ spec:									spec:
     version: 0.1.2							    version: 0.1.2
     dependsOn:								    dependsOn:
     - prometheus-operator-crd						    - prometheus-operator-crd
+  - name: cloud-provider-vsphere					  - name: cloud-provider-vsphere
+    version: 1.11.0							    version: 1.11.0
+    dependsOn:								    dependsOn:
+    - cilium								    - cilium
   - name: coredns							  - name: coredns
     version: 1.21.0							    version: 1.21.0
     dependsOn:								    dependsOn:
@@ -55,8 +57,8 @@ spec:									spec:
     dependsOn:								    dependsOn:
     - prometheus-operator-crd						    - prometheus-operator-crd
   - name: network-policies						  - name: network-policies
-    version: 0.1.1							    version: 0.1.1
     catalog: cluster							    catalog: cluster
+    version: 0.1.1							    version: 0.1.1
     dependsOn:								    dependsOn:
     - cilium								    - cilium
   - name: node-exporter							  - name: node-exporter
@@ -76,8 +78,8 @@ spec:									spec:
     dependsOn:								    dependsOn:
     - prometheus-operator-crd						    - prometheus-operator-crd
   - name: security-bundle						  - name: security-bundle
-    version: 1.8.0							    version: 1.8.0
     catalog: giantswarm							    catalog: giantswarm
+    version: 1.8.0							    version: 1.8.0
     dependsOn:								    dependsOn:
     - prometheus-operator-crd						    - prometheus-operator-crd
   - name: teleport-kube-agent						  - name: teleport-kube-agent

diff --git a/vsphere/v28.0.0/release.yaml b/vsphere/v28.0.0/release.yaml
@@ -4,8 +4,6 @@ metadata:
   name: vsphere-28.0.0
 spec:
   apps:
-  - name: cloud-provider-vsphere
-    version: 1.11.0
   - name: capi-node-labeler
     version: 0.5.0
   - name: cert-exporter
@@ -26,6 +24,10 @@ spec:
     version: 0.1.2
     dependsOn:
     - prometheus-operator-crd
+  - name: cloud-provider-vsphere
+    version: 1.11.0
+    dependsOn:
+    - cilium
   - name: coredns
     version: 1.21.0
     dependsOn:
@@ -55,8 +57,8 @@ spec:
     dependsOn:
     - prometheus-operator-crd
   - name: network-policies
-    version: 0.1.1
     catalog: cluster
+    version: 0.1.1
     dependsOn:
     - cilium
   - name: node-exporter
@@ -76,8 +78,8 @@ spec:
     dependsOn:
     - prometheus-operator-crd
   - name: security-bundle
-    version: 1.8.0
     catalog: giantswarm
+    version: 1.8.0
     dependsOn:
     - prometheus-operator-crd
   - name: teleport-kube-agent