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.

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

Fix yamlResolver route #1004

Merged
merged 3 commits into from
Nov 29, 2023
Merged

Fix yamlResolver route #1004

merged 3 commits into from
Nov 29, 2023

Conversation

olexii4
Copy link
Contributor

@olexii4 olexii4 commented Nov 28, 2023

What does this PR do?

Fix the '*.yaml' resolver route.

What issues does this PR fix or reference?

fixes eclipse-che/che#22456

Is it tested? How?

  1. Start a minikube
minikube start --cpus 4 --memory 10240 --disk-size=30GB --vm-driver=docker 
  1. Generate certificates for the minikube cluster
bash <(curl -sL  https://gist.githubusercontent.com/tolusha/ac9e11e04b1d4b3e6da43acc872425b7/raw/fd9aefcc5f6b01494e1f0c613ce6fd3f48e2b4ee/generate-minikube-certs.sh)

cat domain.crt ca.crt > chain.crt
kubectl -n kube-system create secret tls mkcert --key domain.key --cert chain.crt
minikube addons enable ingress 
minikube addons configure ingress <<< kube-system/mkcert
minikube addons disable ingress
minikube addons enable ingress
  1. Deploy devfile registry operator
git clone https://github.com/devfile/registry-operator
cd registry-operator
make install-cert
kubectl wait --for=condition=ready pod -l app.kubernetes.io/component=controller -n cert-manager --timeout=60s 
kubectl wait --for=condition=ready pod -l app.kubernetes.io/component=cainjector -n cert-manager --timeout=60s 
kubectl wait --for=condition=ready pod -l app.kubernetes.io/component=webhook -n cert-manager --timeout=60s
make install
make deploy
kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=devfileregistry-operator -n registry-operator-system --timeout=60s

kubectl create namespace registry
cat <<EOF | kubectl apply -f -                                                                                                                                       
apiVersion: registry.devfile.io/v1alpha1
kind: DevfileRegistry
metadata:
  name: devfile-registry
  namespace: registry
spec:
  devfileIndex:
    image: quay.io/devfile/devfile-index:next
  tls:
    enabled: true
  k8s:
    ingressDomain: $(minikube ip).nip.io
  telemetry:
    registryName: test
EOF
  1. Deploy Eclipse Che (chectl next version)
cat > p.yaml <<EOF
kind: CheCluster
apiVersion: org.eclipse.che/v2
spec:
  networking:
    tlsSecretName: ""
  components:
cat > p.yaml <<EOF
kind: CheCluster
apiVersion: org.eclipse.che/v2
spec:
  networking:
    tlsSecretName: ""
  components:
    dashboard:
      deployment:
        containers:
          - image: quay.io/eclipse/che-dashboard:pr-1004
            imagePullPolicy: Always
    devfileRegistry:
      disableInternalRegistry: true
      externalDevfileRegistries:
        - url: https://devfile-registry.$(minikube ip).nip.io
EOF

chectl server:deploy -p minikube --che-operator-cr-patch-yaml p.yaml --skip-cert-manager
    devfileRegistry:
      disableInternalRegistry: true
      externalDevfileRegistries:
      - url: https://devfile-registry.$(minikube ip).nip.io
EOF

chectl server:deploy -p minikube --che-operator-cr-patch-yaml p.yaml --skip-cert-manager
  1. Open dashboard and try to start a workspace
chectl dashboard:open

Copy link

openshift-ci bot commented Nov 28, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@che-bot
Copy link
Contributor

che-bot commented Nov 28, 2023

Click here to review and test in web IDE: Contribute

Copy link

codecov bot commented Nov 28, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (26cde8b) 86.50% compared to head (438d0f7) 86.50%.
Report is 2 commits behind head on main.

❗ Current head 438d0f7 differs from pull request most recent head 1f512b8. Consider uploading reports for the commit 1f512b8 to get more accurate results

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1004   +/-   ##
=======================================
  Coverage   86.50%   86.50%           
=======================================
  Files         383      383           
  Lines       39396    39397    +1     
  Branches     2580     2580           
=======================================
+ Hits        34078    34079    +1     
  Misses       5292     5292           
  Partials       26       26           
Flag Coverage Δ
unittests 86.50% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@olexii4 olexii4 force-pushed the CHE-22683 branch 2 times, most recently from 4decef6 to 34af55a Compare November 28, 2023 02:18
Copy link

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-1004

@olexii4 olexii4 requested a review from tolusha November 28, 2023 03:05
@olexii4 olexii4 marked this pull request as ready for review November 28, 2023 03:05
Copy link
Contributor

@akurinnoy akurinnoy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please run yarn license:generate in the root of the project to update lists of used dependencies.

@olexii4
Copy link
Contributor Author

olexii4 commented Nov 28, 2023

Please run yarn license:generate in the root of the project to update lists of used dependencies.

#1006

@akurinnoy
Copy link
Contributor

#1006

You have changes in used dependencies in this particular pull request so you need to re-generate licenses for this PR. Otherwise, lists of used dependencies and licenses will not match.
Is there something I've missed?

@olexii4
Copy link
Contributor Author

olexii4 commented Nov 28, 2023

#1006

You have changes in used dependencies in this particular pull request so you need to re-generate licenses for this PR. Otherwise, lists of used dependencies and licenses will not match. Is there something I've missed?

I have not generated license files yet. I created a separate PR because I want to separate license problems with more than 15 libraries that we have in the main branch from the scope of the current PR which removes one useless library.

Signed-off-by: Oleksii Orel <[email protected]>
Copy link

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-1004

Copy link

Docker image build succeeded: quay.io/eclipse/che-dashboard:pr-1004

kubectl patch command
kubectl patch -n eclipse-che "checluster/eclipse-che" --type=json -p="[{"op": "replace", "path": "/spec/components/dashboard/deployment", "value": {containers: [{image: "quay.io/eclipse/che-dashboard:pr-1004", name: che-dashboard}]}}]"

Copy link

openshift-ci bot commented Nov 29, 2023

@olexii4: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/v11-dashboard-happy-path 6c3e262 link true /test v11-dashboard-happy-path

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Copy link

openshift-ci bot commented Nov 29, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: akurinnoy, ibuziuk, olexii4, tolusha

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@olexii4 olexii4 merged commit 88599f4 into main Nov 29, 2023
13 of 14 checks passed
@olexii4 olexii4 deleted the CHE-22683 branch November 29, 2023 12:34
@devstudio-release
Copy link

Build 3.11 :: dashboard_3.x/409: Console, Changes, Git Data

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

Build 3.11 :: dashboard_3.x/409: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.x/5429 triggered

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

Build 3.11 :: copyIIBsToQuay/2223: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.11 :: sync-to-downstream_3.x/5430: SUCCESS

Build container: devspaces-operator-bundle synced; /DS_CI/get-sources-rhpkg-container-build_3.x/5304 triggered; /job/DS_CI/job/dsc_3.x triggered;

@devstudio-release
Copy link

Build 3.11 :: operator-bundle_3.x/2338: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.x/5430 triggered

@devstudio-release
Copy link

Build 3.11 :: dsc_3.x/1604: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.11 :: update-digests_3.x/5063: SUCCESS

Detected new images: rebuild operator-bundle
* dashboard; /DS_CI/operator-bundle_3.x/2338 triggered

@devstudio-release
Copy link

Build 3.11 :: dsc_3.x/1604: SUCCESS

3.11.0-CI

@devstudio-release
Copy link

Build 3.11 :: copyIIBsToQuay/2223: SUCCESS

3.11
arches = x86_64, s390x, ppc64le;
  * LATEST DS OPERATOR BUNDLE = <a href=https://quay.io/repository/devspaces/devspaces-operator-bundle?tab=tags>registry-proxy.engineering.redhat.com/rh-osbs/devspaces-operator-bundle:3.11-113
  * LATEST DS OPERATOR BUNDLE = <a href=https://quay.io/repository/devspaces/devspaces-operator-bundle?tab=tags>registry-proxy.engineering.redhat.com/rh-osbs/devspaces-operator-bundle:???
  * LATEST DWO OPERATOR BUNDLE = <a href=https://quay.io/repository/devworkspace/devworkspace-operator-bundle?tab=tags>registry-proxy.engineering.redhat.com/rh-osbs/devworkspace-operator-bundle:0.21-7
+ s390x-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.11-v4.14-630674-533291-s390x
  + quay.io/devspaces/iib:3.11-v4.14-s390x
  + quay.io/devspaces/iib:next-v4.14-s390x
  + quay.io/devspaces/iib:3.11-v4.13-630666-533286-s390x
  + quay.io/devspaces/iib:3.11-v4.13-s390x
  + quay.io/devspaces/iib:next-v4.13-s390x
  + quay.io/devspaces/iib:3.11-v4.12-630742-533281-s390x
  + quay.io/devspaces/iib:3.11-v4.12-s390x
  + quay.io/devspaces/iib:next-v4.12-s390x
  + quay.io/devspaces/iib:3.11-v4.11-630740-533277-s390x
  + quay.io/devspaces/iib:3.11-v4.11-s390x
  + quay.io/devspaces/iib:next-v4.11-s390x
+ x86_64-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.11-v4.14-630674-533291-x86_64
  + quay.io/devspaces/iib:3.11-v4.14-x86_64
  + quay.io/devspaces/iib:next-v4.14-x86_64
  + quay.io/devspaces/iib:3.11-v4.13-630666-533286-x86_64
  + quay.io/devspaces/iib:3.11-v4.13-x86_64
  + quay.io/devspaces/iib:next-v4.13-x86_64
  + quay.io/devspaces/iib:3.11-v4.12-630742-533281-x86_64
  + quay.io/devspaces/iib:3.11-v4.12-x86_64
  + quay.io/devspaces/iib:next-v4.12-x86_64
  + quay.io/devspaces/iib:3.11-v4.11-630740-533277-x86_64
  + quay.io/devspaces/iib:3.11-v4.11-x86_64
  + quay.io/devspaces/iib:next-v4.11-x86_64
+ ppc64le-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.11-v4.14-630674-533291-ppc64le
  + quay.io/devspaces/iib:3.11-v4.14-ppc64le
  + quay.io/devspaces/iib:next-v4.14-ppc64le
  + quay.io/devspaces/iib:3.11-v4.13-630666-533286-ppc64le
  + quay.io/devspaces/iib:3.11-v4.13-ppc64le
  + quay.io/devspaces/iib:next-v4.13-ppc64le
  + quay.io/devspaces/iib:3.11-v4.12-630742-533281-ppc64le
  + quay.io/devspaces/iib:3.11-v4.12-ppc64le
  + quay.io/devspaces/iib:next-v4.12-ppc64le
  + quay.io/devspaces/iib:3.11-v4.11-630740-533277-ppc64le
  + quay.io/devspaces/iib:3.11-v4.11-ppc64le
  + quay.io/devspaces/iib:next-v4.11-ppc64le

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Failed to read devfile from registry.devfile.io deployed on the cluster
6 participants