wip: hypershift: pao

Signed-off-by: Talor Itzhak <titzhak@redhat.com>
openshift · Mar 14, 2024 · f1c78a1 · f1c78a1
1 parent bf71a4c
commit f1c78a1
Show file tree

Hide file tree

Showing 5 changed files with 171 additions and 0 deletions.
diff --git a/...openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml b/...openshift/cluster-node-tuning-operator/openshift-cluster-node-tuning-operator-master.yaml
@@ -80,6 +80,38 @@ tests:
   steps:
     cluster_profile: hypershift
     workflow: hypershift-aws-e2e-external
+- as: e2e-hypershift-pao
+  steps:
+    cluster_profile: hypershift
+    test:
+    - as: e2e-hypershift-pao
+      cli: latest
+      commands: |-
+        # CLI_DIR
+        # SHARED_DIR
+        # CLUSTER_TYPE=hypershift
+        export CLUSTER_NAME="$(echo -n $PROW_JOB_ID|sha256sum|cut -c-20)"
+        echo CLUSTER_NAME ${CLUSTER_NAME}
+
+        export HYPERSHIFT_MANAGEMENT_CLUSTER_KUBECONFIG="${SHARED_DIR}/management_cluster_kubeconfig"
+        echo  HYPERSHIFT_MANAGEMENT_CLUSTER_KUBECONFIG
+        cat ${HYPERSHIFT_MANAGEMENT_CLUSTER_KUBECONFIG}
+
+        export HYPERSHIFT_MANAGEMENT_CLUSTER_NAMESPACE="$(${CLI_DIR}/oc get hcp -A -o=jsonpath="{.items[?(@.metadata.name==\"$CLUSTER_NAME\")].metadata.namespace}")"
+        echo HYPERSHIFT_MANAGEMENT_CLUSTER_NAMESPACE ${HYPERSHIFT_MANAGEMENT_CLUSTER_NAMESPACE}
+
+        export KUBECONFIG=${SHARED_DIR}/nested_kubeconfig
+        echo KUBECONFIG
+        cat ${KUBECONFIG}
+
+        make cluster-label-worker-cnf test-unit
+        sleep 3600
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+    workflow: hypershift-aws-e2e-cluster
 - as: e2e-aws-ovn
   steps:
     cluster_profile: aws

diff --git a/...luster-node-tuning-operator/openshift-cluster-node-tuning-operator-master-presubmits.yaml b/...luster-node-tuning-operator/openshift-cluster-node-tuning-operator-master-presubmits.yaml
@@ -565,6 +565,84 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e-hypershift,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build02
+    context: ci/prow/e2e-hypershift-pao
+    decorate: true
+    labels:
+      ci-operator.openshift.io/cloud: hypershift
+      ci-operator.openshift.io/cloud-cluster-profile: hypershift
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-node-tuning-operator-master-e2e-hypershift-pao
+    rerun_command: /test e2e-hypershift-pao
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --secret-dir=/usr/local/e2e-hypershift-pao-cluster-profile
+        - --target=e2e-hypershift-pao
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /usr/local/e2e-hypershift-pao-cluster-profile
+          name: cluster-profile
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: cluster-profile
+        secret:
+          secretName: cluster-secrets-hypershift
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-hypershift-pao,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

diff --git a/ci-operator/step-registry/hypershift/aws/e2e/cluster/OWNERS b/ci-operator/step-registry/hypershift/aws/e2e/cluster/OWNERS
@@ -0,0 +1,13 @@
+approvers:
+- csrwng
+- enxebre
+- sjenning
+- imain
+- davidvossel
+- LiangquanLi930
+options: {}
+reviewers:
+- csrwng
+- enxebre
+- sjenning
+- imain
diff --git a/...tep-registry/hypershift/aws/e2e/cluster/hypershift-aws-e2e-cluster-workflow.metadata.json b/...tep-registry/hypershift/aws/e2e/cluster/hypershift-aws-e2e-cluster-workflow.metadata.json
@@ -0,0 +1,19 @@
+{
+	"path": "hypershift/aws/e2e/cluster/hypershift-aws-e2e-cluster-workflow.yaml",
+	"owners": {
+		"approvers": [
+			"csrwng",
+			"enxebre",
+			"sjenning",
+			"imain",
+			"davidvossel",
+			"LiangquanLi930"
+		],
+		"reviewers": [
+			"csrwng",
+			"enxebre",
+			"sjenning",
+			"imain"
+		]
+	}
+}
diff --git a/...perator/step-registry/hypershift/aws/e2e/cluster/hypershift-aws-e2e-cluster-workflow.yaml b/...perator/step-registry/hypershift/aws/e2e/cluster/hypershift-aws-e2e-cluster-workflow.yaml
@@ -0,0 +1,29 @@
+workflow:
+  as: hypershift-aws-e2e-cluster
+  documentation: |-
+    The HyperShift aws e2e cluster workflow provides pre- and post- steps that provision and
+    deprovision a a new ephemeral HyperShift cluster.
+    Administrative access to the control plane is provided
+    via the `KUBECONFIG` environment variable.
+
+    The HyperShift launch capability is currently supported by the HyperShift
+    team. For now, please direct all questions and comments to:
+
+    - Alberto Lamela (agarcial@redhat.com)
+    - Seth Jennings (sjenning@redhat.com)
+    - Cesar Wong (cewong@redhat.com)
+
+    Learn more about HyperShift here: https://github.com/openshift/hypershift
+
+    Track HyperShift's development here: https://issues.redhat.com/projects/HOSTEDCP
+  steps:
+    pre:
+      - ref: ipi-install-rbac
+      - chain: hypershift-aws-setup-nested-management-cluster
+      - ref: hypershift-install
+      - chain: hypershift-aws-create
+    post:
+    - chain: hypershift-dump
+    - chain: hypershift-aws-destroy
+    - chain: hypershift-aws-destroy-nested-management-cluster
+