Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
9. Perform the [image promotion process](https://github.com/kubernetes/k8s.io/tree/master/k8s.gcr.io#image-promoter).
The staging repository is at https://console.cloud.google.com/gcr/images/k8s-staging-capi-openstack/GLOBAL. Be
sure to choose the top level `capi-openstack-controller`, which will provide the multi-arch manifest, rather than one for a specific architecture.
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)
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)
10. Finalise the release notes
11. Publish release. Use the pre-release option for release
candidate versions of Cluster API Provider OpenStack.
Expand Down
6 changes: 3 additions & 3 deletions templates/cluster-template-without-lb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
cloudName: ${OPENSTACK_CLOUD}
cloudsSecret:
name: ${CLUSTER_NAME}-cloud-config
namespace: ${CLUSTER_NAME}
namespace: ${NAMESPACE}
controlPlaneEndpoint:
host: ${OPENSTACK_CONTROLPLANE_IP}
port: 6443
Expand Down Expand Up @@ -118,7 +118,7 @@ spec:
cloudName: ${OPENSTACK_CLOUD}
cloudsSecret:
name: ${CLUSTER_NAME}-cloud-config
namespace: ${CLUSTER_NAME}
namespace: ${NAMESPACE}
---
apiVersion: cluster.x-k8s.io/v1alpha3
kind: MachineDeployment
Expand Down Expand Up @@ -154,7 +154,7 @@ spec:
cloudName: ${OPENSTACK_CLOUD}
cloudsSecret:
name: ${CLUSTER_NAME}-cloud-config
namespace: ${CLUSTER_NAME}
namespace: ${NAMESPACE}
flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
image: ${OPENSTACK_IMAGE_NAME}
---
Expand Down
6 changes: 3 additions & 3 deletions templates/cluster-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
cloudName: ${OPENSTACK_CLOUD}
cloudsSecret:
name: ${CLUSTER_NAME}-cloud-config
namespace: ${CLUSTER_NAME}
namespace: ${NAMESPACE}
managedAPIServerLoadBalancer: true
apiServerLoadBalancerFloatingIP: ${OPENSTACK_CONTROLPLANE_IP}
apiServerLoadBalancerPort: 6443
Expand Down Expand Up @@ -119,7 +119,7 @@ spec:
cloudName: ${OPENSTACK_CLOUD}
cloudsSecret:
name: ${CLUSTER_NAME}-cloud-config
namespace: ${CLUSTER_NAME}
namespace: ${NAMESPACE}
---
apiVersion: cluster.x-k8s.io/v1alpha3
kind: MachineDeployment
Expand Down Expand Up @@ -155,7 +155,7 @@ spec:
cloudName: ${OPENSTACK_CLOUD}
cloudsSecret:
name: ${CLUSTER_NAME}-cloud-config
namespace: ${CLUSTER_NAME}
namespace: ${NAMESPACE}
flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR}
image: ${OPENSTACK_IMAGE_NAME}
---
Expand Down