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: update go dependencies #1987

Merged
merged 3 commits into from
Oct 21, 2024
Merged

fix: update go dependencies #1987

merged 3 commits into from
Oct 21, 2024

Conversation

okozachenko1203
Copy link
Member

@okozachenko1203 okozachenko1203 commented Oct 18, 2024

oras-go is the main reason.
types.AuthConfig is deprecated in docker v25.x.x.
This causes unit test failure.

/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:44:20: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:62:131: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:122:32: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login.go:54:16: undefined: types.AuthConfig

oras-go is indirect dep belonging to helm.sh/helm/v3.
Since v3.15.2, helm uses 1.2.5 oras-go.
Btw, I updated helm to v3.16.2.

here are references.

oras-project/oras-go#691 oras-project/oras-go#697 https://github.com/helm/helm/releases/tag/v3.15.2

oras-go is the main reason.
types.AuthConfig is deprecated in docker v25.x.x.
This causes unit test failure.
```
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:44:20: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:62:131: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:122:32: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login.go:54:16: undefined: types.AuthConfig
```

oras-go is indirect dep belonging to helm.sh/helm/v3.
since v3.15.2, helm uses 1.2.5 oras-go.

here are references.
oras-project/oras-go#691
oras-project/oras-go#697
https://github.com/helm/helm/releases/tag/v3.15.2
@mnaser mnaser added the gate label Oct 21, 2024
@atmosphere-ci atmosphere-ci bot merged commit b5106b9 into main Oct 21, 2024
7 checks passed
@atmosphere-ci atmosphere-ci bot deleted the update-deps branch October 21, 2024 22:30
@mnaser
Copy link
Member

mnaser commented Oct 22, 2024

/cherry-pick stable/2024.1

@mnaser
Copy link
Member

mnaser commented Oct 22, 2024

/cherry-pick stable/2023.2

@mnaser
Copy link
Member

mnaser commented Oct 22, 2024

/cherry-pick stable/2023.1

@mnaser
Copy link
Member

mnaser commented Oct 22, 2024

/cherry-pick stable/zed

@vexxhost-bot
Copy link
Collaborator

@mnaser: #1987 failed to apply on top of branch "stable/2024.1":

Applying: fix: update go dependencies
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
Auto-merging go.mod
Applying: go mod tidy
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 go mod tidy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick stable/2024.1

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-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@mnaser: new issue created for failed cherrypick: #2001

In response to this:

/cherry-pick stable/2024.1

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-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@mnaser: #1987 failed to apply on top of branch "stable/2023.2":

Applying: fix: update go dependencies
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
Auto-merging go.mod
Applying: go mod tidy
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 go mod tidy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick stable/2023.2

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-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@mnaser: new issue created for failed cherrypick: #2002

In response to this:

/cherry-pick stable/2023.2

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-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@mnaser: #1987 failed to apply on top of branch "stable/2023.1":

Applying: fix: update go dependencies
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
Auto-merging go.mod
Applying: go mod tidy
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 go mod tidy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick stable/2023.1

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-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@mnaser: new issue created for failed cherrypick: #2003

In response to this:

/cherry-pick stable/2023.1

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-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@mnaser: #1987 failed to apply on top of branch "stable/zed":

Applying: fix: update go dependencies
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: update go dependencies
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick stable/zed

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-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@mnaser: new issue created for failed cherrypick: #2004

In response to this:

/cherry-pick stable/zed

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-sigs/prow repository.

okozachenko1203 added a commit that referenced this pull request Oct 22, 2024
oras-go is the main reason.
types.AuthConfig is deprecated in docker v25.x.x.
This causes unit test failure.
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:44:20: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:62:131: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:122:32: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login.go:54:16: undefined: types.AuthConfig
oras-go is indirect dep belonging to helm.sh/helm/v3.
Since v3.15.2, helm uses 1.2.5 oras-go.
Btw, I updated helm to v3.16.2.
here are references.
oras-project/oras-go#691 oras-project/oras-go#697 https://github.com/helm/helm/releases/tag/v3.15.2
okozachenko1203 added a commit that referenced this pull request Oct 22, 2024
oras-go is the main reason.
types.AuthConfig is deprecated in docker v25.x.x.
This causes unit test failure.
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:44:20: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:62:131: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:122:32: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login.go:54:16: undefined: types.AuthConfig
oras-go is indirect dep belonging to helm.sh/helm/v3.
Since v3.15.2, helm uses 1.2.5 oras-go.
Btw, I updated helm to v3.16.2.
here are references.
oras-project/oras-go#691 oras-project/oras-go#697 https://github.com/helm/helm/releases/tag/v3.15.2
okozachenko1203 added a commit that referenced this pull request Oct 22, 2024
oras-go is the main reason.
types.AuthConfig is deprecated in docker v25.x.x.
This causes unit test failure.
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:44:20: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:62:131: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:122:32: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login.go:54:16: undefined: types.AuthConfig
oras-go is indirect dep belonging to helm.sh/helm/v3.
Since v3.15.2, helm uses 1.2.5 oras-go.
Btw, I updated helm to v3.16.2.
here are references.
oras-project/oras-go#691 oras-project/oras-go#697 https://github.com/helm/helm/releases/tag/v3.15.2
okozachenko1203 added a commit that referenced this pull request Oct 22, 2024
oras-go is the main reason.
types.AuthConfig is deprecated in docker v25.x.x.
This causes unit test failure.
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:44:20: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:62:131: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:122:32: undefined: types.AuthConfig
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login.go:54:16: undefined: types.AuthConfig
oras-go is indirect dep belonging to helm.sh/helm/v3.
Since v3.15.2, helm uses 1.2.5 oras-go.
Btw, I updated helm to v3.16.2.
here are references.
oras-project/oras-go#691 oras-project/oras-go#697 https://github.com/helm/helm/releases/tag/v3.15.2
atmosphere-ci bot pushed a commit that referenced this pull request Oct 30, 2024
remove 1.22 from TestKubeconform test (node-feature-discovery uses grpc in probe which is available since 1.22)
add a workaround values in TestKubeconform for loki chart
skip CephFilesystemSubVolumeGroup kind for ceph chart
fix oslo_db test expected values
update TestImageExist test to support image tags without digest
fix pxc test codes
supplement placement chart value for database max_retries param

depends-on: #1977
depends-on: #1211
depends-on: #1987 #1211 #1977

Reviewed-by: Mohammed Naser <[email protected]>
Reviewed-by: Oleksandr K.
okozachenko1203 added a commit that referenced this pull request Oct 31, 2024
remove 1.22 from TestKubeconform test (node-feature-discovery uses grpc in probe which is available since 1.22)
add a workaround values in TestKubeconform for loki chart
skip CephFilesystemSubVolumeGroup kind for ceph chart
fix oslo_db test expected values
update TestImageExist test to support image tags without digest
fix pxc test codes
supplement placement chart value for database max_retries param

depends-on: #1977
depends-on: #1211
depends-on: #1987 #1211 #1977

Reviewed-by: Mohammed Naser <[email protected]>
Reviewed-by: Oleksandr K.
okozachenko1203 added a commit that referenced this pull request Oct 31, 2024
remove 1.22 from TestKubeconform test (node-feature-discovery uses grpc in probe which is available since 1.22)
add a workaround values in TestKubeconform for loki chart
skip CephFilesystemSubVolumeGroup kind for ceph chart
fix oslo_db test expected values
update TestImageExist test to support image tags without digest
fix pxc test codes
supplement placement chart value for database max_retries param

depends-on: #1977
depends-on: #1211
depends-on: #1987 #1211 #1977

Reviewed-by: Mohammed Naser <[email protected]>
Reviewed-by: Oleksandr K.
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.

3 participants