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

UPSTREAM: <carry>: Upgrade go version to 1.21 and go.mod package versions #56

Merged
merged 1 commit into from
Jun 14, 2024

Conversation

DharmitD
Copy link
Member

@DharmitD DharmitD commented Jun 11, 2024

Description of your changes:
Upgrade go version to 1.21
Resolve go.opentelemetry.io/contrib package related CVEs by upgrading package version to latest
Update License CSVs
Remove follow tags to be in sync with cpaas midstream.

Implemented fixes on my fork, tested them out by importing the fork in my personal snyk account and making sure the CVEs were eliminated.

Checklist:

@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 0 commits between 2aacfe2781c01939e087e188cdb04a0e117bfb2c...fe059b09fba2abc679beaf8bb375bc6563381e19

@DharmitD DharmitD changed the title UPSTREAM: <carry>: Upgrade go version to 1.21 and resolve CVEs UPSTREAM: <carry>: Upgrade go version to 1.21 and go.opentelemetry.io/contrib package version Jun 12, 2024
@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 0 commits between 2aacfe2781c01939e087e188cdb04a0e117bfb2c...750bb84227c3f507ec42f40fea6206ea88f0b7d9

@DharmitD DharmitD changed the title UPSTREAM: <carry>: Upgrade go version to 1.21 and go.opentelemetry.io/contrib package version UPSTREAM: <carry>: Upgrade go version to 1.21 and contrib package version Jun 12, 2024
@DharmitD DharmitD changed the title UPSTREAM: <carry>: Upgrade go version to 1.21 and contrib package version UPSTREAM: <carry>: Upgrade go version to 1.21 and go.mod package versions Jun 12, 2024
@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 0 commits between 2aacfe2781c01939e087e188cdb04a0e117bfb2c...f860573b99119c7af9001520c2e165a69bd521b4

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-56
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-56
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-56
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-56
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-56
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-56

@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 0 commits between 2aacfe2781c01939e087e188cdb04a0e117bfb2c...54482e6db9aaddca67168d87bdf11d2f73ea7c44

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-56
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-56
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-56
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-56
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-56
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-56

@@ -16,8 +16,8 @@
ARG SOURCE_CODE=.

# Use ubi8/nodejs-14 as base image
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.20)
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1)

Choose a reason for hiding this comment

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

Doesn't matter much but there is a typo here in the #@follow_tag, it should be registry.access.redhat.com/ubi8/go-toolset:21 but apart from that tested overall and it looks good.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done, updated it to be 1.21. Thanks!

@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 0 commits between 2aacfe2781c01939e087e188cdb04a0e117bfb2c...2c264cc72d62f6941bccfbf2f01f23b6e35b64a5

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-56
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-56
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-56
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-56
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-56
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-56

@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.20.4-alpine3.17 as builder
FROM golang:1.21.4-alpine3.17 as builder

Choose a reason for hiding this comment

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

some dockerfiles look like they weren't updated like launcher, can you go over those again?

Copy link
Member Author

Choose a reason for hiding this comment

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

done, updated all dockerfiles.

@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 2 commits between 2aacfe2781c01939e087e188cdb04a0e117bfb2c...480e9a0c6e210ed64c80c7beb2a7e5366945c4e2

UPSTREAM commit 480e9a0 has invalid summary Update go version references to 1.21.

UPSTREAM commits are validated against the following regular expression:
  ^UPSTREAM: (revert: )?(([\w.-]+/[\w-.-]+)?: )?(\d+:|<carry>:|<drop>:)

UPSTREAM commit summaries should look like:

  UPSTREAM: <PR number|carry|drop>: description

UPSTREAM commits which revert previous UPSTREAM commits should look like:

  UPSTREAM: revert: <normal upstream format>

Examples of valid summaries:

  UPSTREAM: 12345: A kube fix
  UPSTREAM: <carry>: A carried kube change
  UPSTREAM: <drop>: A dropped kube change
  UPSTREAM: revert: 12345: A kube revert


@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 2 commits between 2aacfe2781c01939e087e188cdb04a0e117bfb2c...1863072239509ed51ac4a2fbc8a2e525f504a8be

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-56
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-56
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-56
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-56
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-56
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-56

@@ -18,8 +18,8 @@ ARG CI_CONTAINER_VERSION="unknown"


# Use ubi8/nodejs-14 as base image
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.20)
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.21)
Copy link
Member

Choose a reason for hiding this comment

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

@follow_tags have been removed from midstream, so we should do it here too

Copy link
Member Author

Choose a reason for hiding this comment

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

Done, removed tags.

@@ -16,8 +16,8 @@
ARG SOURCE_CODE=.

# Use ubi8/nodejs-14 as base image
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.20)
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.21)
Copy link
Member

Choose a reason for hiding this comment

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

@follow_tags have been removed from midstream, so we should do it here too

Copy link
Member Author

Choose a reason for hiding this comment

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

Done, removed tags.

@@ -15,8 +15,8 @@
# Build arguments
ARG SOURCE_CODE=.

#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.20)
FROM registry.access.redhat.com/ubi8/go-toolset:1.20 as builder
#@follow_tag(registry.access.redhat.com/ubi8/go-toolset:1.21)
Copy link
Member

Choose a reason for hiding this comment

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

@follow_tags have been removed from midstream, so we should do it here too

Copy link
Member Author

Choose a reason for hiding this comment

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

Done, removed tags.

Copy link
Member

@gmfrasca gmfrasca left a comment

Choose a reason for hiding this comment

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

small comment-removal comments, but otherwise /lgtm

@gmfrasca
Copy link
Member

that said, since you updated go.mod, you'll need to update the license CSVs. you can do that by simply running make all in backend/

@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 3 commits between 2aacfe2781c01939e087e188cdb04a0e117bfb2c...f90fb046f7a9b8120334a11ab063220cc2dede83

@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 4 commits between 2aacfe2781c01939e087e188cdb04a0e117bfb2c...40420106906722c7b20708c5dfd7dad8fca9d53e

@DharmitD
Copy link
Member Author

that said, since you updated go.mod, you'll need to update the license CSVs. you can do that by simply running make all in backend/

Done, updated the license CSVs.

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-56
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-56
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-56
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-56
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-56
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-56

Copy link
Member

@gmfrasca gmfrasca left a comment

Choose a reason for hiding this comment

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

/lgtm

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-56
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-56
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-56
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-56
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-56
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-56

@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 1 commits between ea6815018f49bdb884ff5b955b946f64ffc8f648...f46e5106dd958d92ca85f5c2942306a7b1bb4a69

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-56
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-56
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-56
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-56
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-56
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-56

@HumairAK
Copy link

/lgtm
/approve

@HumairAK HumairAK merged commit dadfb38 into opendatahub-io:master Jun 14, 2024
2 of 3 checks passed
@openshift-ci openshift-ci bot added the lgtm label Jun 14, 2024
Copy link

openshift-ci bot commented Jun 14, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: amadhusu, HumairAK

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

@dsp-developers
Copy link

Commit Checker results:

**NOTE**: These are the results of the commit checker scans. 
If these are not commits from upstream kfp, then please ensure
you adhere to the commit checker formatting
commitchecker verson unknown
Validating 0 commits between dadfb38393ce96cb7dc1eac60428d66f0e3f1933...f46e5106dd958d92ca85f5c2942306a7b1bb4a69

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

Successfully merging this pull request may close these issues.

6 participants