Skip to content

Commit 81a9b2b

Browse files
Change CloudStack config filename, to match the CS k8s provider
The CloudStack Kubernetes provider started using `cloud-config` instead of `cloudstack.ini` in apache/cloudstack-kubernetes-provider@8a3efaf#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5.
1 parent 82435ae commit 81a9b2b

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/bin
22
/test/e2e/e2e.test
33
/test/e2e/ginkgo
4-
/cloudstack.ini
4+
cloud-config

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ plugin for [Apache CloudStack](https://cloudstack.apache.org/).
3030

3131
### Configuration
3232

33-
Create the CloudStack configuration file `cloudstack.ini`.
33+
Create the CloudStack configuration file `cloud-config`.
3434

3535
It should have the following format, defined for the [CloudStack Kubernetes Provider](https://github.com/apache/cloudstack-kubernetes-provider):
3636

@@ -47,7 +47,7 @@ Create a secret named `cloudstack-secret` in namespace `kube-system`:
4747
```
4848
kubectl create secret generic \
4949
--namespace kube-system \
50-
--from-file ./cloudstack.ini \
50+
--from-file ./cloud-config \
5151
cloudstack-secret
5252
```
5353

cmd/cloudstack-csi-driver/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
var (
2323
endpoint = flag.String("endpoint", "unix:///tmp/csi.sock", "CSI endpoint")
24-
cloudstackconfig = flag.String("cloudstackconfig", "./cloudstack.ini", "CloudStack configuration file")
24+
cloudstackconfig = flag.String("cloudstackconfig", "./cloud-config", "CloudStack configuration file")
2525
nodeName = flag.String("nodeName", "", "Node name")
2626
debug = flag.Bool("debug", false, "Enable debug logging")
2727
showVersion = flag.Bool("version", false, "Show version")

cmd/cloudstack-csi-sc-syncer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ spec:
8787
- name: cloudstack-csi-sc-syncer
8888
image: quay.io/apalia/cloudstack-csi-sc-syncer:${version}
8989
args:
90-
- "-cloudstackconfig=/etc/cloudstack-csi-driver/cloudstack.ini"
90+
- "-cloudstackconfig=/etc/cloudstack-csi-driver/cloud-config"
9191
- "-kubeconfig=-"
9292
volumeMounts:
9393
- name: cloudstack-conf

cmd/cloudstack-csi-sc-syncer/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
const agent = "cloudstack-csi-sc-syncer"
1717

1818
var (
19-
cloudstackconfig = flag.String("cloudstackconfig", "./cloudstack.ini", "CloudStack configuration file")
19+
cloudstackconfig = flag.String("cloudstackconfig", "./cloud-config", "CloudStack configuration file")
2020
kubeconfig = flag.String("kubeconfig", path.Join(os.Getenv("HOME"), ".kube/config"), "Kubernetes configuration file. Use \"-\" to use in-cluster configuration.")
2121
label = flag.String("label", "app.kubernetes.io/managed-by="+agent, "")
2222
namePrefix = flag.String("namePrefix", "cloudstack-", "")

deploy/k8s/controller-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
imagePullPolicy: Always
3636
args:
3737
- "-endpoint=$(CSI_ENDPOINT)"
38-
- "-cloudstackconfig=/etc/cloudstack-csi-driver/cloudstack.ini"
38+
- "-cloudstackconfig=/etc/cloudstack-csi-driver/cloud-config"
3939
- "-debug"
4040
env:
4141
- name: CSI_ENDPOINT

deploy/k8s/node-daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
imagePullPolicy: Always
3030
args:
3131
- "-endpoint=$(CSI_ENDPOINT)"
32-
- "-cloudstackconfig=/etc/cloudstack-csi-driver/cloudstack.ini"
32+
- "-cloudstackconfig=/etc/cloudstack-csi-driver/cloud-config"
3333
- "-nodeName=$(NODE_NAME)"
3434
- "-debug"
3535
env:

0 commit comments

Comments
 (0)