longhorn-manager icon indicating copy to clipboard operation
longhorn-manager copied to clipboard

Enable mTLS in for the instance manager proxy service (backport #2533)

Open mergify[bot] opened this issue 1 year ago • 0 comments

This is an automatic backport of pull request #2533 done by Mergify. Cherry-pick of 181c414ab866e7d3a2630d99a2e519a39b4ad235 has failed:

On branch mergify/bp/v1.4.x/pr-2533
Your branch is up to date with 'origin/v1.4.x'.

You are currently cherry-picking commit 181c414a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   vendor/github.com/Microsoft/go-winio/internal/fs/doc.go
	new file:   vendor/github.com/Microsoft/go-winio/internal/fs/fs.go
	new file:   vendor/github.com/Microsoft/go-winio/internal/fs/security.go
	new file:   vendor/github.com/Microsoft/go-winio/internal/fs/zsyscall_windows.go
	new file:   vendor/github.com/Microsoft/go-winio/internal/stringbuffer/wstring.go
	modified:   vendor/github.com/Microsoft/go-winio/zsyscall_windows.go
	new file:   vendor/go.uber.org/atomic/pointer_go118_pre119.go
	new file:   vendor/go.uber.org/zap/array_go118.go
	new file:   vendor/golang.org/x/exp/slices/cmp.go
	modified:   vendor/golang.org/x/mod/semver/semver.go
	new file:   vendor/golang.org/x/tools/internal/event/tag/tag.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   engineapi/instance_manager.go
	both modified:   engineapi/proxy.go
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   vendor/github.com/Microsoft/go-winio/.golangci.yml
	both modified:   vendor/github.com/Microsoft/go-winio/hvsock.go
	deleted by us:   vendor/github.com/Microsoft/go-winio/internal/socket/socket.go
	both modified:   vendor/github.com/Microsoft/go-winio/pipe.go
	both modified:   vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/proxy.go
	both modified:   vendor/go.uber.org/atomic/CHANGELOG.md
	both modified:   vendor/go.uber.org/atomic/bool.go
	both modified:   vendor/go.uber.org/atomic/duration.go
	both modified:   vendor/go.uber.org/atomic/error.go
	deleted by us:   vendor/go.uber.org/atomic/float32.go
	both modified:   vendor/go.uber.org/atomic/float64.go
	both modified:   vendor/go.uber.org/atomic/int32.go
	both modified:   vendor/go.uber.org/atomic/int64.go
	deleted by us:   vendor/go.uber.org/atomic/pointer_go118.go
	both modified:   vendor/go.uber.org/atomic/string.go
	both modified:   vendor/go.uber.org/atomic/string_ext.go
	deleted by us:   vendor/go.uber.org/atomic/time.go
	both modified:   vendor/go.uber.org/atomic/uint32.go
	both modified:   vendor/go.uber.org/atomic/uint64.go
	deleted by us:   vendor/go.uber.org/atomic/uintptr.go
	deleted by us:   vendor/go.uber.org/zap/.readme.tmpl
	deleted by us:   vendor/go.uber.org/zap/CHANGELOG.md
	deleted by us:   vendor/go.uber.org/zap/CONTRIBUTING.md
	deleted by us:   vendor/go.uber.org/zap/README.md
	deleted by us:   vendor/go.uber.org/zap/config.go
	deleted by us:   vendor/go.uber.org/zap/doc.go
	deleted by us:   vendor/go.uber.org/zap/encoder.go
	deleted by us:   vendor/go.uber.org/zap/global.go
	deleted by us:   vendor/go.uber.org/zap/http_handler.go
	deleted by us:   vendor/go.uber.org/zap/internal/exit/exit.go
	deleted by us:   vendor/go.uber.org/zap/internal/level_enabler.go
	deleted by us:   vendor/go.uber.org/zap/level.go
	deleted by us:   vendor/go.uber.org/zap/logger.go
	deleted by us:   vendor/go.uber.org/zap/options.go
	deleted by us:   vendor/go.uber.org/zap/sink.go
	deleted by us:   vendor/go.uber.org/zap/stacktrace.go
	deleted by us:   vendor/go.uber.org/zap/sugar.go
	deleted by us:   vendor/go.uber.org/zap/writer.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/buffered_write_syncer.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/clock.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/console_encoder.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/core.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/encoder.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/entry.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/error.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/hook.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/increase_level.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/json_encoder.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/level.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/reflected_encoder.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/sampler.go
	deleted by us:   vendor/go.uber.org/zap/zapcore/tee.go
	deleted by us:   vendor/go.uber.org/zap/zapgrpc/zapgrpc.go
	deleted by us:   vendor/golang.org/x/exp/slices/slices.go
	deleted by us:   vendor/golang.org/x/exp/slices/sort.go
	deleted by us:   vendor/golang.org/x/exp/slices/zsortanyfunc.go
	deleted by us:   vendor/golang.org/x/exp/slices/zsortordered.go
	added by them:   vendor/golang.org/x/net/http2/objectpath.go
	deleted by us:   vendor/golang.org/x/tools/cmd/stringer/stringer.go
	deleted by us:   vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
	deleted by us:   vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
	deleted by us:   vendor/golang.org/x/tools/go/packages/doc.go
	deleted by us:   vendor/golang.org/x/tools/go/packages/golist.go
	deleted by us:   vendor/golang.org/x/tools/go/packages/packages.go
	deleted by us:   vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
	deleted by us:   vendor/golang.org/x/tools/internal/gcimporter/bimport.go
	deleted by us:   vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
	deleted by us:   vendor/golang.org/x/tools/internal/gcimporter/iexport.go
	deleted by us:   vendor/golang.org/x/tools/internal/gcimporter/iimport.go
	deleted by us:   vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go
	deleted by us:   vendor/golang.org/x/tools/internal/gocommand/invoke.go
	deleted by us:   vendor/golang.org/x/tools/internal/gocommand/version.go
	deleted by us:   vendor/golang.org/x/tools/internal/typeparams/common.go
	deleted by us:   vendor/golang.org/x/tools/internal/typeparams/coretype.go
	deleted by us:   vendor/golang.org/x/tools/internal/typeparams/termlist.go
	deleted by us:   vendor/golang.org/x/tools/internal/typeparams/typeparams_go117.go
	deleted by us:   vendor/golang.org/x/tools/internal/typeparams/typeparams_go118.go
	deleted by us:   vendor/golang.org/x/tools/internal/typeparams/typeterm.go
	deleted by us:   vendor/golang.org/x/tools/internal/typesinternal/types.go
	both modified:   vendor/modules.txt

Cherry-pick of 9a79843907ab259b63f352eac20375640a26473c has failed:

On branch mergify/bp/v1.4.x/pr-2533
Your branch is ahead of 'origin/v1.4.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9a798439.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   engineapi/instance_manager.go
	both modified:   engineapi/proxy.go

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 2f89113035f6ef469a6a2c0d2eaad24413d8bba9 has failed:

On branch mergify/bp/v1.4.x/pr-2533
Your branch is ahead of 'origin/v1.4.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2f891130.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   engineapi/proxy.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   engineapi/disk_service.go
	both modified:   engineapi/instance_manager.go

Cherry-pick of 0dc53fe4f5e542d8fdde9c5c20960feece35ce0d has failed:

On branch mergify/bp/v1.4.x/pr-2533
Your branch is ahead of 'origin/v1.4.x' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0dc53fe4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   engineapi/instance_manager.go
	both modified:   engineapi/proxy.go

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 62620bcef806e5c19cf92bd395fc0bce92a13184 has failed:

On branch mergify/bp/v1.4.x/pr-2533
Your branch is ahead of 'origin/v1.4.x' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 62620bce.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   controller/engine_controller.go
	modified:   controller/instance_manager_controller.go
	modified:   controller/replica_controller.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller/monitor/disk_monitor.go
	both modified:   controller/node_controller.go
	both modified:   controller/orphan_controller.go

Cherry-pick of 5f0b239ad5d5f1f27731fb314668f0dfd1ccd35e has failed:

On branch mergify/bp/v1.4.x/pr-2533
Your branch is ahead of 'origin/v1.4.x' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 5f0b239a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   go.mod
	modified:   go.sum

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/disk.go
	deleted by us:   vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/instance.go
	both modified:   vendor/github.com/longhorn/longhorn-instance-manager/pkg/client/process_manager.go
	both modified:   vendor/modules.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

mergify[bot] avatar Feb 07 '24 06:02 mergify[bot]