diff --git a/template/prd/argocd_v2.12.3/3_apply/ing.yaml b/template/prd/argocd_v2.12.3/3_apply/ing.yaml index a627e80..c31177c 100644 --- a/template/prd/argocd_v2.12.3/3_apply/ing.yaml +++ b/template/prd/argocd_v2.12.3/3_apply/ing.yaml @@ -8,7 +8,12 @@ metadata: #nginx.ingress.kubernetes.io/force-ssl-redirect: "true" nginx.ingress.kubernetes.io/backend-protocol: "https" nginx.ingress.kubernetes.io/ssl-passthrough: "true" - nginx.ingress.kubernetes.io/whitelist-source-range: "10.0.0.0/24,10.1.0.0/16,106.254.240.2/32,10.140.224.0/24" + nginx.ingress.kubernetes.io/whitelist-source-range: | + 114.110.128.150/32, + 114.110.128.46/32, + 114.110.132.4/32, + 114.110.132.5/32, + 106.254.240.2/32 spec: ingressClassName: nginx rules: diff --git a/template/prd/calico_v3.28.2/custom-resources.yaml b/template/prd/calico_v3.28.2/custom-resources.yaml index 8008838..4c7f6a5 100644 --- a/template/prd/calico_v3.28.2/custom-resources.yaml +++ b/template/prd/calico_v3.28.2/custom-resources.yaml @@ -14,6 +14,7 @@ spec: encapsulation: VXLAN # openstack 에서는 VXLAN을 사용해야해안다 byljh natOutgoing: Enabled nodeSelector: all() + kubeletVolumePluginPath: /mnt/vdb/kubelet # calico가 사용하는 kubelet volume path --- diff --git a/template/prd/ddn/ddn-install-running/exa-csi-driver-2.3.5/deploy/kubernetes/exascaler-csi-file-driver.yaml b/template/prd/ddn/ddn-install-running/exa-csi-driver-2.3.5/deploy/kubernetes/exascaler-csi-file-driver.yaml index 90f1751..f617fb3 100644 --- a/template/prd/ddn/ddn-install-running/exa-csi-driver-2.3.5/deploy/kubernetes/exascaler-csi-file-driver.yaml +++ b/template/prd/ddn/ddn-install-running/exa-csi-driver-2.3.5/deploy/kubernetes/exascaler-csi-file-driver.yaml @@ -372,12 +372,12 @@ spec: args: - --v=5 - --csi-address=/csi/csi.sock - - --kubelet-registration-path=/var/lib/kubelet/plugins/exa.csi.ddn.com/csi.sock + - --kubelet-registration-path=/mnt/vdb/kubelet/plugins/exa.csi.ddn.com/csi.sock livenessProbe: exec: command: - /csi-node-driver-registrar - - --kubelet-registration-path=/var/lib/kubelet/plugins/exa.csi.ddn.com/csi.sock + - --kubelet-registration-path=/mnt/vdb/kubelet/plugins/exa.csi.ddn.com/csi.sock - --mode=kubelet-registration-probe initialDelaySeconds: 30 timeoutSeconds: 15 @@ -417,20 +417,20 @@ spec: mountPath: /host mountPropagation: Bidirectional - name: pods-mount-dir - mountPath: /var/lib/kubelet/pods + mountPath: /mnt/vdb/kubelet/pods mountPropagation: Bidirectional volumes: - name: socket-dir hostPath: - path: /var/lib/kubelet/plugins/exa.csi.ddn.com + path: /mnt/vdb/kubelet/plugins/exa.csi.ddn.com type: DirectoryOrCreate - name: registration-dir hostPath: - path: /var/lib/kubelet/plugins_registry/ + path: /mnt/vdb/kubelet/plugins_registry/ type: Directory - name: pods-mount-dir hostPath: - path: /var/lib/kubelet/pods + path: /mnt/vdb/kubelet/pods type: Directory - name: host hostPath: diff --git a/template/prd/ddn/exa-csi-driver/examples/sc.yaml b/template/prd/ddn/exa-csi-driver/examples/sc.yaml index 52b3286..80015fb 100644 --- a/template/prd/ddn/exa-csi-driver/examples/sc.yaml +++ b/template/prd/ddn/exa-csi-driver/examples/sc.yaml @@ -5,8 +5,11 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: - name: user-nas + name: component-nas + annotations: + storageclass.kubernetes.io/is-default-class: "true" provisioner: exa.csi.ddn.com parameters: # projectId: "100001" # Points to a project id to be used to set volume quota. # bindMount: "false" +reclaimPolicy: Retain diff --git a/template/prd/ddn/internal-nas.yaml b/template/prd/ddn/internal-nas.yaml new file mode 100644 index 0000000..e9342c5 --- /dev/null +++ b/template/prd/ddn/internal-nas.yaml @@ -0,0 +1,9 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: internal-nas +provisioner: exa.csi.ddn.com +parameters: + # projectId: "100001" # Points to a project id to be used to set volume quota. + # bindMount: "false" + diff --git a/template/prd/ddn/sc.yaml b/template/prd/ddn/sc.yaml new file mode 100644 index 0000000..200b375 --- /dev/null +++ b/template/prd/ddn/sc.yaml @@ -0,0 +1,12 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: component-nas + annotations: + storageclass.kubernetes.io/is-default-class: "true" +provisioner: exa.csi.ddn.com +parameters: + # projectId: "100001" # Points to a project id to be used to set volume quota. + # bindMount: "false" +reclaimPolicy: Retain + diff --git a/template/prd/ddn/user-nas.yaml b/template/prd/ddn/user-nas.yaml new file mode 100644 index 0000000..c000d05 --- /dev/null +++ b/template/prd/ddn/user-nas.yaml @@ -0,0 +1,9 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: user-nas +provisioner: exa.csi.ddn.com +parameters: + # projectId: "100001" # Points to a project id to be used to set volume quota. + # bindMount: "false" + diff --git a/template/prd/ingress-nginx/2_configmap/configmap.yaml b/template/prd/ingress-nginx/2_configmap/configmap.yaml index f4c72a8..e32c77b 100644 --- a/template/prd/ingress-nginx/2_configmap/configmap.yaml +++ b/template/prd/ingress-nginx/2_configmap/configmap.yaml @@ -2,6 +2,7 @@ apiVersion: v1 data: allow-snippet-annotations: "true" + use-proxy-protocol: "true" kind: ConfigMap metadata: labels: