Skip to content

Commit 08613c9

Browse files
sbueringerpierreprinetti
authored andcommitted
fixup namespace handling in 0.3.0 (kubernetes-sigs#521)
1 parent 589f13a commit 08613c9

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
9. Perform the [image promotion process](https://github.com/kubernetes/k8s.io/tree/master/k8s.gcr.io#image-promoter).
3636
The staging repository is at https://console.cloud.google.com/gcr/images/k8s-staging-capi-openstack/GLOBAL. Be
3737
sure to choose the top level `capi-openstack-controller`, which will provide the multi-arch manifest, rather than one for a specific architecture.
38-
Add the new sha=>tag mapping to the [images.yaml](https://github.com/kubernetes/k8s.io/edit/master/k8s.gcr.io/images/k8s-staging-capi-openstack/images.yaml)
38+
Add the new sha=>tag mapping to the [images.yaml](https://github.com/kubernetes/k8s.io/edit/master/k8s.gcr.io/images/k8s-staging-capi-openstack/images.yaml) (use the sha of the image with the corresponding tag)
3939
10. Finalise the release notes
4040
11. Publish release. Use the pre-release option for release
4141
candidate versions of Cluster API Provider OpenStack.

templates/cluster-template-without-lb.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
cloudName: ${OPENSTACK_CLOUD}
2626
cloudsSecret:
2727
name: ${CLUSTER_NAME}-cloud-config
28-
namespace: ${CLUSTER_NAME}
28+
namespace: ${NAMESPACE}
2929
controlPlaneEndpoint:
3030
host: ${OPENSTACK_CONTROLPLANE_IP}
3131
port: 6443
@@ -118,7 +118,7 @@ spec:
118118
cloudName: ${OPENSTACK_CLOUD}
119119
cloudsSecret:
120120
name: ${CLUSTER_NAME}-cloud-config
121-
namespace: ${CLUSTER_NAME}
121+
namespace: ${NAMESPACE}
122122
---
123123
apiVersion: cluster.x-k8s.io/v1alpha3
124124
kind: MachineDeployment
@@ -154,7 +154,7 @@ spec:
154154
cloudName: ${OPENSTACK_CLOUD}
155155
cloudsSecret:
156156
name: ${CLUSTER_NAME}-cloud-config
157-
namespace: ${CLUSTER_NAME}
157+
namespace: ${NAMESPACE}
158158
flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
159159
image: ${OPENSTACK_IMAGE_NAME}
160160
---

templates/cluster-template.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
cloudName: ${OPENSTACK_CLOUD}
2626
cloudsSecret:
2727
name: ${CLUSTER_NAME}-cloud-config
28-
namespace: ${CLUSTER_NAME}
28+
namespace: ${NAMESPACE}
2929
managedAPIServerLoadBalancer: true
3030
apiServerLoadBalancerFloatingIP: ${OPENSTACK_CONTROLPLANE_IP}
3131
apiServerLoadBalancerPort: 6443
@@ -119,7 +119,7 @@ spec:
119119
cloudName: ${OPENSTACK_CLOUD}
120120
cloudsSecret:
121121
name: ${CLUSTER_NAME}-cloud-config
122-
namespace: ${CLUSTER_NAME}
122+
namespace: ${NAMESPACE}
123123
---
124124
apiVersion: cluster.x-k8s.io/v1alpha3
125125
kind: MachineDeployment
@@ -155,7 +155,7 @@ spec:
155155
cloudName: ${OPENSTACK_CLOUD}
156156
cloudsSecret:
157157
name: ${CLUSTER_NAME}-cloud-config
158-
namespace: ${CLUSTER_NAME}
158+
namespace: ${NAMESPACE}
159159
flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
160160
image: ${OPENSTACK_IMAGE_NAME}
161161
---

0 commit comments

Comments
 (0)