Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removed namespace for clusterclass and cluster with topology #384

Merged
merged 1 commit into from
Mar 7, 2024
+0 −29
Merged

removed namespace for clusterclass and cluster with topology #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions templates/base-root/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

namespace: "${NAMESPACE}"

configMapGenerator:
- name: nutanix-ccm
behavior: merge
Expand Down
11 changes: 0 additions & 11 deletions templates/cluster-template-clusterclass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ binaryData:
kind: ConfigMap
metadata:
name: ${CLUSTER_NAME}-pc-trusted-ca-bundle
namespace: ${NAMESPACE}
---
apiVersion: v1
data:
Expand Down Expand Up @@ -223,13 +222,11 @@ data:
kind: ConfigMap
metadata:
name: nutanix-ccm
namespace: ${NAMESPACE}
---
apiVersion: v1
kind: Secret
metadata:
name: ${CLUSTER_NAME}
namespace: ${NAMESPACE}
stringData:
credentials: |
[
Expand All @@ -248,7 +245,6 @@ apiVersion: v1
kind: Secret
metadata:
name: nutanix-ccm-secret
namespace: ${NAMESPACE}
stringData:
nutanix-ccm-secret.yaml: |
apiVersion: v1
Expand Down Expand Up @@ -276,7 +272,6 @@ apiVersion: addons.cluster.x-k8s.io/v1beta1
kind: ClusterResourceSet
metadata:
name: nutanix-ccm-crs
namespace: ${NAMESPACE}
spec:
clusterSelector:
matchLabels:
Expand All @@ -294,7 +289,6 @@ apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate
metadata:
name: ${CLUSTER_CLASS_NAME}-kcfg-0
namespace: ${NAMESPACE}
spec:
template:
spec:
Expand All @@ -315,7 +309,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
kind: ClusterClass
metadata:
name: ${CLUSTER_CLASS_NAME}
namespace: ${NAMESPACE}
spec:
controlPlane:
machineHealthCheck:
Expand Down Expand Up @@ -621,7 +614,6 @@ apiVersion: controlplane.cluster.x-k8s.io/v1beta1
kind: KubeadmControlPlaneTemplate
metadata:
name: ${CLUSTER_CLASS_NAME}-kcpt
namespace: ${NAMESPACE}
spec:
template:
spec:
Expand Down Expand Up @@ -753,7 +745,6 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: NutanixClusterTemplate
metadata:
name: ${CLUSTER_CLASS_NAME}-nct
namespace: ${NAMESPACE}
spec:
template:
spec:
Expand All @@ -763,7 +754,6 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: NutanixMachineTemplate
metadata:
name: ${CLUSTER_CLASS_NAME}-cp-nmt
namespace: ${NAMESPACE}
spec:
template:
spec:
Expand All @@ -787,7 +777,6 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: NutanixMachineTemplate
metadata:
name: ${CLUSTER_CLASS_NAME}-md-nmt
namespace: ${NAMESPACE}
spec:
template:
spec:
Expand Down
1 change: 0 additions & 1 deletion templates/cluster-template-topology.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ metadata:
ccm: nutanix
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
name: ${CLUSTER_NAME}
namespace: ${NAMESPACE}
spec:
clusterNetwork:
pods:
Expand Down
2 changes: 0 additions & 2 deletions templates/clusterclass/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

namespace: "${NAMESPACE}"

bases:
- ../base-root
- ./nct.yaml
Expand Down
2 changes: 0 additions & 2 deletions templates/topology/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

namespace: "${NAMESPACE}"

bases:
- ./cluster-with-topology.yaml

Expand Down
11 changes: 0 additions & 11 deletions test/e2e/data/infrastructure-nutanix/v1beta1/clusterclass-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ binaryData:
kind: ConfigMap
metadata:
name: ${CLUSTER_NAME}-pc-trusted-ca-bundle
namespace: ${NAMESPACE}
---
apiVersion: v1
data:
Expand Down Expand Up @@ -223,13 +222,11 @@ data:
kind: ConfigMap
metadata:
name: nutanix-ccm
namespace: ${NAMESPACE}
---
apiVersion: v1
kind: Secret
metadata:
name: ${CLUSTER_NAME}
namespace: ${NAMESPACE}
stringData:
credentials: |
[
Expand All @@ -248,7 +245,6 @@ apiVersion: v1
kind: Secret
metadata:
name: nutanix-ccm-secret
namespace: ${NAMESPACE}
stringData:
nutanix-ccm-secret.yaml: |
apiVersion: v1
Expand Down Expand Up @@ -276,7 +272,6 @@ apiVersion: addons.cluster.x-k8s.io/v1beta1
kind: ClusterResourceSet
metadata:
name: nutanix-ccm-crs
namespace: ${NAMESPACE}
spec:
clusterSelector:
matchLabels:
Expand All @@ -294,7 +289,6 @@ apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate
metadata:
name: ${CLUSTER_CLASS_NAME}-kcfg-0
namespace: ${NAMESPACE}
spec:
template:
spec:
Expand All @@ -315,7 +309,6 @@ apiVersion: cluster.x-k8s.io/v1beta1
kind: ClusterClass
metadata:
name: ${CLUSTER_CLASS_NAME}
namespace: ${NAMESPACE}
spec:
controlPlane:
machineHealthCheck:
Expand Down Expand Up @@ -621,7 +614,6 @@ apiVersion: controlplane.cluster.x-k8s.io/v1beta1
kind: KubeadmControlPlaneTemplate
metadata:
name: ${CLUSTER_CLASS_NAME}-kcpt
namespace: ${NAMESPACE}
spec:
template:
spec:
Expand Down Expand Up @@ -753,7 +745,6 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: NutanixClusterTemplate
metadata:
name: ${CLUSTER_CLASS_NAME}-nct
namespace: ${NAMESPACE}
spec:
template:
spec:
Expand All @@ -763,7 +754,6 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: NutanixMachineTemplate
metadata:
name: ${CLUSTER_CLASS_NAME}-cp-nmt
namespace: ${NAMESPACE}
spec:
template:
spec:
Expand All @@ -787,7 +777,6 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: NutanixMachineTemplate
metadata:
name: ${CLUSTER_CLASS_NAME}-md-nmt
namespace: ${NAMESPACE}
spec:
template:
spec:
Expand Down
Loading