Merge pull request #257 from manuelbuil/main-source

Add a default flexVolumePluginDir
pull/261/head
Manuel Buil 2022-05-12 12:28:16 +02:00 committed by GitHub
commit e09acacd4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions

View File

@ -1,6 +1,6 @@
--- charts-original/values.yaml --- charts-original/values.yaml
+++ charts/values.yaml +++ charts/values.yaml
@@ -1,8 +1,24 @@ @@ -1,8 +1,25 @@
imagePullSecrets: {} imagePullSecrets: {}
installation: installation:
@ -22,10 +22,11 @@
+ blockSize: 24 + blockSize: 24
+ imagePath: "rancher" + imagePath: "rancher"
+ imagePrefix: "mirrored-calico-" + imagePrefix: "mirrored-calico-"
+ flexVolumePluginDir: "/var/lib/kubelet/volumeplugins"
apiServer: apiServer:
enabled: true enabled: true
@@ -20,9 +36,24 @@ @@ -20,9 +37,24 @@
# Configuration for the tigera operator # Configuration for the tigera operator
tigeraOperator: tigeraOperator:

View File

@ -1,5 +1,5 @@
url: https://github.com/projectcalico/calico/releases/download/v3.21.5/tigera-operator-v3.21.5.tgz url: https://github.com/projectcalico/calico/releases/download/v3.21.5/tigera-operator-v3.21.5.tgz
packageVersion: 01 packageVersion: 02
additionalCharts: additionalCharts:
- workingDir: charts-crd - workingDir: charts-crd
crdOptions: crdOptions:

View File

@ -1,6 +1,6 @@
--- charts-original/values.yaml --- charts-original/values.yaml
+++ charts/values.yaml +++ charts/values.yaml
@@ -1,11 +1,27 @@ @@ -1,11 +1,28 @@
imagePullSecrets: {} imagePullSecrets: {}
installation: installation:
@ -22,6 +22,7 @@
+ blockSize: 24 + blockSize: 24
+ imagePath: "rancher" + imagePath: "rancher"
+ imagePrefix: "mirrored-calico-" + imagePrefix: "mirrored-calico-"
+ flexVolumePluginDir: "/var/lib/kubelet/volumeplugins"
apiServer: apiServer:
- enabled: true - enabled: true
@ -29,7 +30,7 @@
certs: certs:
node: node:
@@ -20,9 +36,24 @@ @@ -20,9 +37,24 @@
# Configuration for the tigera operator # Configuration for the tigera operator
tigeraOperator: tigeraOperator:

View File

@ -1,5 +1,5 @@
url: https://github.com/projectcalico/calico/releases/download/v3.22.2/tigera-operator-v3.22.2.tgz url: https://github.com/projectcalico/calico/releases/download/v3.22.2/tigera-operator-v3.22.2.tgz
packageVersion: 02 packageVersion: 03
additionalCharts: additionalCharts:
- workingDir: charts-crd - workingDir: charts-crd
crdOptions: crdOptions: