From 0e9b17ed27cbe6bdc4248945b46dbcf8048f7af4 Mon Sep 17 00:00:00 2001 From: lwpk110 Date: Fri, 5 Jul 2024 21:26:39 +0800 Subject: [PATCH] chore: rm kerberos e2e --- internal/controller/cluster.go | 5 +- internal/controller/discovery.go | 2 +- internal/controller/hdfscluster_controller.go | 7 +- test/e2e/default/03-secret.yaml | 0 test/e2e/default/04-assert.yaml | 3 +- test/e2e/default/04-hdfs.yaml | 3 - test/e2e/kerberos/00-assert.yaml | 22 ----- test/e2e/kerberos/00-olm.yaml | 37 -------- test/e2e/kerberos/01-assert.yaml | 23 ----- test/e2e/kerberos/01-subs.yaml | 35 -------- test/e2e/kerberos/02-assert.yaml | 13 --- test/e2e/kerberos/02-listener.yaml | 37 -------- test/e2e/kerberos/03-assert.yaml | 24 ------ test/e2e/kerberos/03-secret.yaml | 79 ----------------- test/e2e/kerberos/04-assert.yaml | 14 --- test/e2e/kerberos/04-zookeeper.yaml | 57 ------------ test/e2e/kerberos/05-assert.yaml | 24 ------ test/e2e/kerberos/05-hdfs.yaml | 86 ------------------- 18 files changed, 10 insertions(+), 461 deletions(-) delete mode 100644 test/e2e/default/03-secret.yaml delete mode 100644 test/e2e/kerberos/00-assert.yaml delete mode 100644 test/e2e/kerberos/00-olm.yaml delete mode 100644 test/e2e/kerberos/01-assert.yaml delete mode 100644 test/e2e/kerberos/01-subs.yaml delete mode 100644 test/e2e/kerberos/02-assert.yaml delete mode 100644 test/e2e/kerberos/02-listener.yaml delete mode 100644 test/e2e/kerberos/03-assert.yaml delete mode 100644 test/e2e/kerberos/03-secret.yaml delete mode 100644 test/e2e/kerberos/04-assert.yaml delete mode 100644 test/e2e/kerberos/04-zookeeper.yaml delete mode 100644 test/e2e/kerberos/05-assert.yaml delete mode 100644 test/e2e/kerberos/05-hdfs.yaml diff --git a/internal/controller/cluster.go b/internal/controller/cluster.go index 6ba85fc..fce1e6c 100644 --- a/internal/controller/cluster.go +++ b/internal/controller/cluster.go @@ -60,6 +60,7 @@ func (c *ClusterReconciler) ReconcileCluster(ctx context.Context) (ctrl.Result, c.preReconcile() // reconcile resource of cluster level + c.Log.Info("Reconciling cluster resource") if len(c.resourceReconcilers) > 0 { res, err := common.ReconcilerDoHandler(ctx, c.resourceReconcilers) if err != nil { @@ -71,6 +72,7 @@ func (c *ClusterReconciler) ReconcileCluster(ctx context.Context) (ctrl.Result, } //reconcile role + c.Log.Info("Reconciling role resource") for _, r := range c.roleReconcilers { res, err := r.ReconcileRole(ctx) if err != nil { @@ -81,7 +83,8 @@ func (c *ClusterReconciler) ReconcileCluster(ctx context.Context) (ctrl.Result, } } - // reconcile discovery + // reconcile discovery\ + c.Log.Info("Reconciling discovery resource") res, err := c.ReconcileDiscovery(ctx) if err != nil { return ctrl.Result{}, err diff --git a/internal/controller/discovery.go b/internal/controller/discovery.go index 20cab11..e2bfbae 100644 --- a/internal/controller/discovery.go +++ b/internal/controller/discovery.go @@ -46,7 +46,7 @@ func NewDiscovery( func (d *Discovery) Build(ctx context.Context) (client.Object, error) { return &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Name: d.Instance.GetName() + "-discovery", + Name: d.Instance.GetName(), Namespace: d.Instance.Namespace, Labels: d.MergedLabels, }, diff --git a/internal/controller/hdfscluster_controller.go b/internal/controller/hdfscluster_controller.go index c9c6ca5..8f04b63 100644 --- a/internal/controller/hdfscluster_controller.go +++ b/internal/controller/hdfscluster_controller.go @@ -72,10 +72,11 @@ func (r *HdfsClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) result, err := NewClusterReconciler(r.Client, r.Scheme, cr).ReconcileCluster(ctx) if err != nil { return ctrl.Result{}, err + } else if result.RequeueAfter > 0 { + return result, nil } - - r.Log.Info("Successfully reconciled HdfsCluster") - return result, nil + r.Log.Info("Reconcile successfully ", "Name", cr.Name) + return ctrl.Result{}, nil } // UpdateStatus updates the status of the HdfsCluster resource diff --git a/test/e2e/default/03-secret.yaml b/test/e2e/default/03-secret.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/test/e2e/default/04-assert.yaml b/test/e2e/default/04-assert.yaml index f527972..2dbb989 100644 --- a/test/e2e/default/04-assert.yaml +++ b/test/e2e/default/04-assert.yaml @@ -20,5 +20,4 @@ metadata: name: hdfscluster-sample-default-datanode status: availableReplicas: 2 - replicas: 2 - + replicas: 2 \ No newline at end of file diff --git a/test/e2e/default/04-hdfs.yaml b/test/e2e/default/04-hdfs.yaml index 4bfb81c..dfaa310 100644 --- a/test/e2e/default/04-hdfs.yaml +++ b/test/e2e/default/04-hdfs.yaml @@ -15,9 +15,6 @@ spec: tag: 3.3.4 clusterConfig: zookeeperDiscoveryZNode: sample-hdfs-znode - authentication: - kerberos: - secretClass: hdfs-kerberos nameNode: roleGroups: default: diff --git a/test/e2e/kerberos/00-assert.yaml b/test/e2e/kerberos/00-assert.yaml deleted file mode 100644 index 9f37ead..0000000 --- a/test/e2e/kerberos/00-assert.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: kubedatastack-operators -status: - phase: Active ---- -apiVersion: v1 -kind: Namespace -metadata: - name: kubedatastack -status: - phase: Active ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: CatalogSource -metadata: - name: kubedata-catalog - namespace: olm -status: - connectionState: - lastObservedState: READY diff --git a/test/e2e/kerberos/00-olm.yaml b/test/e2e/kerberos/00-olm.yaml deleted file mode 100644 index 7194def..0000000 --- a/test/e2e/kerberos/00-olm.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: kubedatastack-operators ---- -apiVersion: v1 -kind: Namespace -metadata: - name: kubedatastack ---- -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: zncdata-stack - namespace: kubedatastack-operators -spec: - # if not specified, the operator group will target all namespaces - # so the operator will be able to watch and manage resources in all namespaces - targetNamespaces: - - kubedatastack ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: CatalogSource -metadata: - name: kubedata-catalog - namespace: olm -spec: - sourceType: grpc - grpcPodConfig: - securityContextConfig: restricted - image: quay.io/zncdatadev/kubedata-catalog:latest - displayName: kubedata-catalog - publisher: zncdatadev - updateStrategy: - registryPoll: - interval: 5m - diff --git a/test/e2e/kerberos/01-assert.yaml b/test/e2e/kerberos/01-assert.yaml deleted file mode 100644 index eba7b9c..0000000 --- a/test/e2e/kerberos/01-assert.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: zookeeper-operator-controller-manager - namespace: kubedatastack-operators -status: - availableReplicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: listener-operator-controller-manager - namespace: kubedatastack-operators -status: - availableReplicas: 1 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: secret-operator-controller-manager - namespace: kubedatastack-operators -status: - availableReplicas: 1 diff --git a/test/e2e/kerberos/01-subs.yaml b/test/e2e/kerberos/01-subs.yaml deleted file mode 100644 index 1b97976..0000000 --- a/test/e2e/kerberos/01-subs.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: listener-sub - namespace: kubedatastack-operators -spec: - channel: stable - name: listener-operator - source: kubedata-catalog - sourceNamespace: olm - installPlanApproval: Automated ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: secret-sub - namespace: kubedatastack-operators -spec: - channel: stable - name: secret-operator - source: kubedata-catalog - sourceNamespace: olm - installPlanApproval: Automated ---- -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: zookeeper-sub - namespace: kubedatastack-operators -spec: - channel: stable - name: zookeeper-operator - source: kubedata-catalog - sourceNamespace: olm - installPlanApproval: Automated diff --git a/test/e2e/kerberos/02-assert.yaml b/test/e2e/kerberos/02-assert.yaml deleted file mode 100644 index 698f068..0000000 --- a/test/e2e/kerberos/02-assert.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: listenercsi-sample-csi - namespace: kubedatastack -status: - currentNumberScheduled: 1 - desiredNumberScheduled: 1 - numberAvailable: 1 - numberMisscheduled: 0 - numberReady: 1 - observedGeneration: 1 - updatedNumberScheduled: 1 diff --git a/test/e2e/kerberos/02-listener.yaml b/test/e2e/kerberos/02-listener.yaml deleted file mode 100644 index 032a89a..0000000 --- a/test/e2e/kerberos/02-listener.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: listeners.zncdata.dev/v1alpha1 -kind: ListenerCSI -metadata: - labels: - app.kubernetes.io/name: listenercsi - app.kubernetes.io/instance: listenercsi-sample - app.kubernetes.io/part-of: listener-operator - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: listener-operator - name: listenercsi-sample - namespace: kubedatastack -spec: - csiDriver: - repository: quay.io/zncdatadev/listener-csi-driver - tag: v0.0.1 - pullPolicy: IfNotPresent - logging: - level: "10" - nodeDriverRegistrar: - repository: registry.k8s.io/sig-storage/csi-node-driver-registrar - tag: v2.8.0 - pullPolicy: IfNotPresent - logging: - level: "10" - csiProvisioner: - repository: registry.k8s.io/sig-storage/csi-provisioner - tag: v3.5.0 - pullPolicy: IfNotPresent - logging: - level: "10" - livenessProbe: - repository: registry.k8s.io/sig-storage/livenessprobe - tag: v2.11.0 - pullPolicy: IfNotPresent - logging: - level: "10" - diff --git a/test/e2e/kerberos/03-assert.yaml b/test/e2e/kerberos/03-assert.yaml deleted file mode 100644 index 613d89f..0000000 --- a/test/e2e/kerberos/03-assert.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: secrets.zncdata.dev/v1alpha1 -kind: SecretClass -metadata: - name: kerberos-hdfs ---- -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: secretcsi-sample-csi - namespace: kubedatastack -status: - currentNumberScheduled: 1 - desiredNumberScheduled: 1 - numberAvailable: 1 - numberMisscheduled: 0 - numberReady: 1 - observedGeneration: 1 - updatedNumberScheduled: 1 ---- -apiVersion: v1 -kind: Secret -metadata: - name: secret-provisioner-keytab - namespace: kubedatastack \ No newline at end of file diff --git a/test/e2e/kerberos/03-secret.yaml b/test/e2e/kerberos/03-secret.yaml deleted file mode 100644 index 2f2593b..0000000 --- a/test/e2e/kerberos/03-secret.yaml +++ /dev/null @@ -1,79 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: secret-provisioner-keytab - namespace: kubedatastack -type: Opaque -data: - keytab: BQIAAABJAAIABldIRy5DTgAFYWRtaW4ABWFkbWluAAAAAWaFTeACABQAIE7RgbL+35gACkQ3pqjo7br/Iw65I/N22TeAZTZfey0HAAAAAgAAADkAAgAGV0hHLkNOAAVhZG1pbgAFYWRtaW4AAAABZoVN4AIAEwAQbF0qBIzv9rg0Mr3xbfh6OAAAAAIAAABJAAIABldIRy5DTgAFYWRtaW4ABWFkbWluAAAAAWaFTeACABIAIKq3PzSuqEBm0TIDiphnNRoJ6ofzWjW5xVGketlv0pobAAAAAgAAADkAAgAGV0hHLkNOAAVhZG1pbgAFYWRtaW4AAAABZoVN4AIAEQAQgmZcD+dE+ifkKW2wXqm5QQAAAAIAAABJAAIABldIRy5DTgAFYWRtaW4ABWFkbWluAAAAAWaFTeACABoAIJYfRZErMzk2R8gnStLnE6MCNUq1XrUM/Q7dkaAIKzrPAAAAAgAAADkAAgAGV0hHLkNOAAVhZG1pbgAFYWRtaW4AAAABZoVN4AIAGQAQ4BEpLHxf3z5dskzJENgh1gAAAAIAAAA5AAIABldIRy5DTgAFYWRtaW4ABWFkbWluAAAAAWaFTeACABcAEJvcYdtaP87W2C1JJ58fBDAAAAAC ---- -apiVersion: secrets.zncdata.dev/v1alpha1 -kind: SecretClass -metadata: - name: kerberos-hdfs - namespace: kubedatastack -spec: - backend: - kerberosKeytab: - realm: WHG.CN - kdc: kerberos.whg.cn - adminServer: - mit: - kadminServer: kerberos.whg.cn - adminKeytabSecret: - namespace: kubedatastack - name: secret-provisioner-keytab - adminPrincipal: admin/admin@WHG.CN ---- -apiVersion: secrets.zncdata.dev/v1alpha1 -kind: SecretClass -metadata: - name: tls - namespace: kubedatastack -spec: - backend: - autoTls: - ca: - autoGenerated: true - caCertificateLifeTime: 730h - secret: - name: tls-hdfs-ca - namespace: kubedatastack - maxCertificateLifeTime: 360h ---- -apiVersion: secrets.zncdata.dev/v1alpha1 -kind: SecretCSI -metadata: - labels: - app.kubernetes.io/name: secretcsi - app.kubernetes.io/instance: secretcsi-sample - app.kubernetes.io/part-of: secret-operator - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: secret-operator - name: secretcsi-sample - namespace: kubedatastack -spec: - csiDriver: - repository: quay.io/zncdatadev/secret-csi-driver - tag: v0.0.1 - pullPolicy: IfNotPresent - logging: - level: "10" - nodeDriverRegistrar: - repository: registry.k8s.io/sig-storage/csi-node-driver-registrar - tag: v2.8.0 - pullPolicy: IfNotPresent - logging: - level: "10" - csiProvisioner: - repository: registry.k8s.io/sig-storage/csi-provisioner - tag: v3.5.0 - pullPolicy: IfNotPresent - # logging: - # level: "10" - livenessProbe: - repository: registry.k8s.io/sig-storage/livenessprobe - tag: v2.11.0 - pullPolicy: IfNotPresent - logging: - level: "10" \ No newline at end of file diff --git a/test/e2e/kerberos/04-assert.yaml b/test/e2e/kerberos/04-assert.yaml deleted file mode 100644 index 5a3c569..0000000 --- a/test/e2e/kerberos/04-assert.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: zookeepercluster-sample-default - namespace: kubedatastack -status: - availableReplicas: 2 - replicas: 2 ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: sample-hdfs-znode - namespace: kubedatastack diff --git a/test/e2e/kerberos/04-zookeeper.yaml b/test/e2e/kerberos/04-zookeeper.yaml deleted file mode 100644 index 3f7a094..0000000 --- a/test/e2e/kerberos/04-zookeeper.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: zookeeper.zncdata.dev/v1alpha1 -kind: ZookeeperCluster -metadata: - labels: - app.kubernetes.io/name: zookeepercluster - app.kubernetes.io/instance: zookeepercluster-sample - app.kubernetes.io/part-of: zookeeper-operator - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: zookeeper-operator - name: zookeepercluster-sample - namespace: kubedatastack -spec: - image: - repository: docker.io/bitnami/zookeeper - tag: 3.9.1-debian-12-r15 - clusterConfig: - service: - type: NodePort - port: 2181 - server: - config: - resources: - cpu: - min: "100m" - max: "200m" - memory: - limit: "1Gi" - roleGroups: - default: - replicas: 2 - config: - logging: - zookeeperCluster: - loggers: - test: - level: DEBUG - console: - level: WARN - file: - level: INFO ---- -apiVersion: zookeeper.zncdata.dev/v1alpha1 -kind: ZookeeperZnode -metadata: - labels: - app.kubernetes.io/name: zookeeperznode - app.kubernetes.io/instance: zookeeperznode-sample - app.kubernetes.io/part-of: zookeeper-operator - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: zookeeper-operator - name: sample-hdfs-znode - namespace: kubedatastack -spec: - clusterRef: - name: zookeepercluster-sample - namespace: kubedatastack - diff --git a/test/e2e/kerberos/05-assert.yaml b/test/e2e/kerberos/05-assert.yaml deleted file mode 100644 index f527972..0000000 --- a/test/e2e/kerberos/05-assert.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: hdfscluster-sample-default-journalnode -status: - availableReplicas: 1 - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: hdfscluster-sample-default-namenode -status: - availableReplicas: 2 - replicas: 2 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: hdfscluster-sample-default-datanode -status: - availableReplicas: 2 - replicas: 2 - diff --git a/test/e2e/kerberos/05-hdfs.yaml b/test/e2e/kerberos/05-hdfs.yaml deleted file mode 100644 index 731b106..0000000 --- a/test/e2e/kerberos/05-hdfs.yaml +++ /dev/null @@ -1,86 +0,0 @@ -apiVersion: hdfs.zncdata.dev/v1alpha1 -kind: HdfsCluster -metadata: - labels: - app.kubernetes.io/name: hdfscluster - app.kubernetes.io/instance: hdfscluster-sample - app.kubernetes.io/part-of: hdfs-operator - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: hdfs-operator - name: hdfscluster-sample - namespace: kubedatastack -spec: - image: - repository: quay.io/zncdatadev/hadoop - tag: 3.3.4 - clusterConfig: - zookeeperDiscoveryZNode: sample-hdfs-znode - authentication: - tls: - secretClass: tls - jksPassword: "123456" - kerberos: - secretClass: kerberos-hdfs - - nameNode: - roleGroups: - default: - replicas: 2 - config: - resources: - cpu: - min: 200m - max: 1500m - memory: - limit: "2Gi" - logging: - namenode: - loggers: - test: - level: DEBUG - console: - level: WARN - file: - level: ERROR - formatNameNode: - loggers: - test-format: - level: DEBUG - journalNode: - roleGroups: - default: - replicas: 1 - config: - resources: - cpu: - min: 100m - max: 1500m - memory: - limit: "1Gi" - logging: - journalNode: - loggers: - test: - level: DEBUG - console: - level: WARN - file: - level: ERROR - dataNode: - roleGroups: - default: - replicas: 2 - config: - resources: - cpu: - min: 200m - max: 1500m - memory: - limit: "2Gi" - logging: - datanode: - loggers: - test: - level: DEBUG - console: - level: WARN