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

chore: Update devfile/api dependency to v2.2.1 #1186

Merged
merged 3 commits into from
Oct 16, 2023

Conversation

AObuchow
Copy link
Collaborator

What does this PR do?

Updates the devfile/api dependency to the v2.2.1 (commit devfile/api@1ae41b5). This is required for #1179, as the devfile validation library was previously preventing a deworkspace from having a container component and openshift/kubernetes component from using the same target port on an endpoint.

I also added a controller env test to test the case from #1179, but this might be redundant as this functionality should already be tested in the devfile API repo.

What issues does this PR fix or reference?

#1179

Is it tested? How?

Install DWO with the changes from this PR, and create a devworkspace with a container component and kubernetes (or openshift) component that uses the same endpoint target port, such as the following:

kind: DevWorkspace
apiVersion: workspace.devfile.io/v1alpha2
metadata:
  name: plain-devworkspace
spec:
  started: true
  routingClass: 'basic'
  template:
    components:
      - name: kubernetes-deploy
        kubernetes:
          deployByDefault: true
          endpoints:
            - name: http-8080
              path: /
              targetPort: 8080
          inlined: |
            apiVersion: v1
            kind: Pod
            metadata:
              name: webserver-dwo-deployed
              namespace: devworkspace-controller
            spec:
              containers:
                - name: webserver
                  image: nginx:latest
                  ports:
                    - containerPort: 8080
      - name: web-terminal
        container:
          image: quay.io/wto/web-terminal-tooling:next
          memoryRequest: 256Mi
          memoryLimit: 512Mi
          mountSources: true
          command:
           - "tail"
           - "-f"
           - "/dev/null"
          endpoints:
            - name: 'http'
              protocol: http
              targetPort: 8080
              exposure: public

Ensure the workspace starts up as expected. You should see a pod get deployed to the devworkspace-controller namespace called webserver-dwo-deployed. The main thing to ensure is the workspace does not fail to startup with the following reason: * devfile contains multiple containers with same endpoint targetPort: 8080

PR Checklist

  • E2E tests pass (when PR is ready, comment /test v8-devworkspace-operator-e2e, v8-che-happy-path to trigger)
    • v8-devworkspace-operator-e2e: DevWorkspace e2e test
    • v8-che-happy-path: Happy path for verification integration with Che
      Signed-off-by: Andrew Obuchowicz aobuchow@redhat.com

@openshift-ci
Copy link

openshift-ci bot commented Oct 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: amisevsk, AObuchow

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

The pull request process is described 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

Signed-off-by: Andrew Obuchowicz <aobuchow@redhat.com>
Signed-off-by: Andrew Obuchowicz <aobuchow@redhat.com>
…er and kubernetes component

Signed-off-by: Andrew Obuchowicz <aobuchow@redhat.com>
@AObuchow AObuchow force-pushed the update-devfile-api-v2.2.1-release branch from 1608bff to bdac5e8 Compare October 13, 2023 15:47
@openshift-ci openshift-ci bot removed the lgtm label Oct 13, 2023
@openshift-ci
Copy link

openshift-ci bot commented Oct 13, 2023

New changes are detected. LGTM label has been removed.

@AObuchow
Copy link
Collaborator Author

/retest

@codecov
Copy link

codecov bot commented Oct 13, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (b12f682) 52.90% compared to head (bdac5e8) 53.10%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1186      +/-   ##
==========================================
+ Coverage   52.90%   53.10%   +0.19%     
==========================================
  Files          84       84              
  Lines        7551     7551              
==========================================
+ Hits         3995     4010      +15     
+ Misses       3273     3259      -14     
+ Partials      283      282       -1     

see 2 files with indirect coverage changes

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

@AObuchow AObuchow merged commit 0f1d799 into devfile:main Oct 16, 2023
8 checks passed
@AObuchow AObuchow deleted the update-devfile-api-v2.2.1-release branch October 16, 2023 20:07
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.

2 participants