diff --git a/hieradata/roles/infra/k8s/control.yaml b/hieradata/roles/infra/k8s/control.yaml index 72f769e..30472e4 100644 --- a/hieradata/roles/infra/k8s/control.yaml +++ b/hieradata/roles/infra/k8s/control.yaml @@ -29,9 +29,9 @@ rke2::csi_ceph_templates: rke2::extra_config_files: - namespaces - rke2-canal-config - - purelb_config - - ingres_lb_nginx - - ingres_route_rancher + - purelb-config + - ingres-lb-nginx + - ingres-route-rancher rke2::config_hash: advertise-address: "%{hiera('networking_loopback0_ip')}" cluster-domain: "svc.k8s.unkin.net" diff --git a/modules/rke2/files/ceph-csi-nodeplugin-rbac.yaml b/modules/rke2/files/ceph-csi-nodeplugin-rbac.yaml index c21b7ea..8be3689 100644 --- a/modules/rke2/files/ceph-csi-nodeplugin-rbac.yaml +++ b/modules/rke2/files/ceph-csi-nodeplugin-rbac.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: rbd-csi-nodeplugin - namespace: ceph‑csi + namespace: ceph-csi --- kind: ClusterRole @@ -41,7 +41,7 @@ metadata: subjects: - kind: ServiceAccount name: rbd-csi-nodeplugin - namespace: ceph‑csi + namespace: ceph-csi roleRef: kind: ClusterRole name: rbd-csi-nodeplugin diff --git a/modules/rke2/files/ceph-csi-provisioner-rbac.yaml b/modules/rke2/files/ceph-csi-provisioner-rbac.yaml index 369d3b1..36ed47b 100644 --- a/modules/rke2/files/ceph-csi-provisioner-rbac.yaml +++ b/modules/rke2/files/ceph-csi-provisioner-rbac.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: rbd-csi-provisioner - namespace: ceph‑csi + namespace: ceph-csi --- kind: ClusterRole @@ -89,7 +89,7 @@ metadata: subjects: - kind: ServiceAccount name: rbd-csi-provisioner - namespace: ceph‑csi + namespace: ceph-csi roleRef: kind: ClusterRole name: rbd-external-provisioner-runner @@ -100,7 +100,7 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: name: rbd-external-provisioner-cfg - namespace: ceph‑csi + namespace: ceph-csi rules: - apiGroups: [""] resources: ["configmaps"] @@ -114,11 +114,11 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: rbd-csi-provisioner-role-cfg - namespace: ceph‑csi + namespace: ceph-csi subjects: - kind: ServiceAccount name: rbd-csi-provisioner - namespace: ceph‑csi + namespace: ceph-csi roleRef: kind: Role name: rbd-external-provisioner-cfg diff --git a/modules/rke2/files/ceph-csi-rbdplugin-provisioner.yaml b/modules/rke2/files/ceph-csi-rbdplugin-provisioner.yaml index e226a6d..492dd7e 100644 --- a/modules/rke2/files/ceph-csi-rbdplugin-provisioner.yaml +++ b/modules/rke2/files/ceph-csi-rbdplugin-provisioner.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: csi-rbdplugin-provisioner - namespace: ceph‑csi + namespace: ceph-csi labels: app: csi‑metrics spec: @@ -20,7 +20,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: csi‑rbdplugin‑provisioner - namespace: ceph‑csi + namespace: ceph-csi spec: replicas: 3 selector: diff --git a/modules/rke2/files/ceph-csi-rbdplugin.yaml b/modules/rke2/files/ceph-csi-rbdplugin.yaml index 88e932d..a23c705 100644 --- a/modules/rke2/files/ceph-csi-rbdplugin.yaml +++ b/modules/rke2/files/ceph-csi-rbdplugin.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: csi‑rbdplugin - namespace: ceph‑csi + namespace: ceph-csi spec: selector: matchLabels: @@ -142,7 +142,7 @@ apiVersion: v1 kind: Service metadata: name: csi-metrics-rbdplugin - namespace: ceph‑csi + namespace: ceph-csi labels: app: csi‑metrics spec: diff --git a/modules/rke2/files/ingres_lb_nginx.yaml b/modules/rke2/files/ingres-lb-nginx.yaml similarity index 100% rename from modules/rke2/files/ingres_lb_nginx.yaml rename to modules/rke2/files/ingres-lb-nginx.yaml diff --git a/modules/rke2/files/ingres_route_rancher.yaml b/modules/rke2/files/ingres-route-rancher.yaml similarity index 100% rename from modules/rke2/files/ingres_route_rancher.yaml rename to modules/rke2/files/ingres-route-rancher.yaml diff --git a/modules/rke2/files/purelb_config.yaml b/modules/rke2/files/purelb-config.yaml similarity index 100% rename from modules/rke2/files/purelb_config.yaml rename to modules/rke2/files/purelb-config.yaml