KusionStack / kusion

77%

main: 46%

LAST BUILD ON BRANCH 3-ways-merge

branch: 3-ways-merge

CHANGE BRANCH

x

Reset

Sync Branches

• 3-ways-merge
• 1143-fix-bug-in-convertkusionprobetov1probe
• 3-way-diff
• SparkYuan-fix-readme-link
• SparkYuan-patch-1
• action-type
• adapt-new-model-adjusts
• add-apply-gif
• add-cmd-config
• add-config-model
• add-doc-design
• add-dsl-connection-doc
• add-job-module-remove-validate-settings-yaml
• add-kcl-open-api-release
• add-mod-pull
• add-module-apis
• add-openssf-badge
• add-pagination
• add-pr-template
• add-product-hunt-badge
• add-project-stack-cmd
• add-stack-in-runtime
• add-structured-backend-config
• add-tf-provider-cache
• add-windows-e2e
• add-workspace-apis
• add-workspace-edit-cmd
• addSetSecretInInterface
• add_app_configuration_design_doc
• add_aws_secret_provider
• add_azure_keyvault_support
• add_base_cmd_option
• add_base_secret_mng_interface
• add_cluster_in_cli
• add_extensions
• add_fake_secret_store_provider
• add_mod_cmd
• add_probe_types
• add_provider_registry
• add_query
• add_registry_client
• add_secret_management_proposal
• add_separate_crd_visitor
• add_vault_secret_provider
• adjust-Dockerfile
• adjust-github-action
• adjust-github-action-configurations
• alicloud-provider-version
• api_doc
• appconfig
• appconfig-shecma-type
• appconfiguration-generator-refactor-br
• assert-bug
• auto-import-resources
• aws-port
• backend-config
• backend-def
• backend-impl
• backend-release
• backend-state
• backend-workspace
• batchv1
• brew-depends
• brew-install
• bug-fix-1358
• bugfix-1358
• bugfix-action
• bugfix-compile
• bugfix-delete-node
• bugfix-destroy-tf
• bugfix-pb-width
• bugfix-stack-name
• bugfix/probe-readiness-port
• bump-go-version
• bump-goutil
• bump-kcl-0.5.1
• bump-kcl-go
• bump-kcl-go-version
• bump-kcl-version-0.5.0-alpha.2
• bump-kcl-version-0.5.0-alpha.3
• bump-kcl-version-0.5.0-beta.1
• bump-kcl-version-to-v0.6.0-alpha.1
• bump-kcl-version-v0.4.6.2
• bump-kclvm-version
• bump-kpm-version
• bump-yaml-version-to-v3.0.0
• chai2010-patch-1
• chang-tf-log-level
• chore
• chore-adjust-about-quality
• chore-msg
• chore-plugin
• chore-refine-codeowners
• chore_project
• cla
• clean-expired-docs
• clean-spec
• clean-up-version
• cleancode
• cleanup-codes
• cleanup-table
• cleanup_useless_code
• cmd-config
• cmd-doc
• code-of-conduct
• code_cleanup
• collaboration
• collaset-generator
• compile
• compile-arguments
• compile-flag
• complete-appconfig-model-ut
• complete-workload-ut
• complete-workload-ut-again
• config
• config-prune
• config-registry-0306
• config-test
• config-ut
• config-validation-0304
• context
• contributing
• create-default-workspace
• cronE2e
• crypto
• custom-params
• customize-workload-deserialization-with-type
• customize-workload-yaml-deserialization-with-type
• dayuan
• dedup-err
• default-backend
• del-pulumi
• del-spec-storage
• delete-compile
• delete-deps
• delete-internal-api
• delete-kusion-path
• delete-kusionctl-pkg
• delete-mysql
• delete-workspace-deprecated
• delete_app_from_meta
• delete_kustomize
• delete_signal_handler
• dependabot/go_modules/github.com/cloudflare/circl-1.3.7
• dependabot/go_modules/github.com/cloudflare/circl-1.6.1
• dependabot/go_modules/github.com/docker/docker-23.0.3incompatible
• dependabot/go_modules/github.com/docker/docker-25.0.5incompatible
• dependabot/go_modules/github.com/docker/docker-26.1.4incompatible
• dependabot/go_modules/github.com/docker/docker-26.1.5incompatible
• dependabot/go_modules/github.com/docker/docker-28.0.0incompatible
• dependabot/go_modules/github.com/emicklei/go-restful-2.16.0incompatible
• dependabot/go_modules/github.com/go-chi/chi/v5-5.2.2
• dependabot/go_modules/github.com/go-git/go-git/v5-5.13.0
• dependabot/go_modules/github.com/go-jose/go-jose/v3-3.0.3
• dependabot/go_modules/github.com/golang-jwt/jwt/v4-4.5.1
• dependabot/go_modules/github.com/hashicorp/go-getter-1.7.5
• dependabot/go_modules/github.com/hashicorp/go-retryablehttp-0.7.7
• dependabot/go_modules/github.com/lestrrat-go/jwx/v2-2.0.21
• dependabot/go_modules/github.com/ulikunitz/xz-0.5.14
• dependabot/go_modules/golang.org/x/crypto-0.31.0
• dependabot/go_modules/golang.org/x/net-0.33.0
• dependabot/go_modules/google.golang.org/grpc-1.58.3
• dependabot/go_modules/google.golang.org/grpc-1.64.1
• dependabot/go_modules/scripts/install-kcl-openapi/golang.org/x/net-0.17.0
• dependabot/go_modules/scripts/install-kcl-openapi/golang.org/x/net-0.7.0
• dependabot/go_modules/scripts/install-kcl-openapi/golang.org/x/text-0.3.8
• deployment-maxunavaliable
• deprecate-state
• deprecate_old_kfile
• deprecate_old_secret_store
• deprecated-backend-const
• deprecated-state
• destroy-denendency
• dev/xiarui.xr/deps-support-deleted
• dev/xiarui.xr/list-deps
• dev/xiarui.xr/support-kusionctl-image
• dev/yuanyi/update_tf_resource_id
• develop/style#fix-deprecated-ioutil
• doc
• doc-add-override-doc
• doc-multi-cloud-design
• dockerfile
• docs/link
• dynamic-mapper
• e2e
• env-management-proposal
• evn-order
• experimental/istio
• experimental/prometheus
• expose
• feat-1028
• feat-add-prometheus-support
• feat-add-resource-urn
• feat-add-sort-options
• feat-add-trace
• feat-async-runs
• feat-backend
• feat-fix-default-branch
• feat-force-unlock-release
• feat-init-support-target-option
• feat-kclvm-windows-artifact
• feat-kusion-server-design-doc
• feat-stack
• feat-support-gcp-backend
• feat-support-watch-in-runs
• feat-th-1209
• feat/add-alicloud-secret-provider
• feat/add-database-generator
• feat/add-local-database-generator
• feat/app-config
• feat/app-config-add-ci-checks
• feat/ingress
• feat/secret-generator
• feat/support-create-file-with-configmap
• feat/support-kubeconfig-in-stack
• feat/use-map-slice-for-env
• feat_add_e2e_test
• feat_api_graph
• feat_check_provider_hash_change
• feat_code_runner
• feat_container_dirs
• feat_content_from
• feat_customize_namespace
• feat_generate_cmd
• feat_graph
• feat_health
• feat_override_namespace
• feat_project
• feat_resource
• feat_spec_storage
• feat_state_backends
• feat_support_multi_remote_backend
• feat_support_provider_log_output
• feat_terraform_runtime
• ffforest-patch-1
• ffforest-patch-2
• field-template
• filter-unchanged
• fix
• fix-1367
• fix-a-mistake
• fix-apply-crd
• fix-apply-watch
• fix-broken-links
• fix-build
• fix-build-script
• fix-circular-dependency-when-order-change
• fix-compile-with-wd-flag
• fix-confuse-config
• fix-db-cloud-region
• fix-debug-version
• fix-delete
• fix-dependency
• fix-destroy
• fix-destroy-npe
• fix-destroy-rel-update
• fix-dir
• fix-dry-run-not-support
• fix-duplicate-index
• fix-e2e
• fix-e2e-as-new-konfig-dir
• fix-e2e-bug
• fix-e2e-test-again
• fix-empty-resource-name
• fix-empty-resources
• fix-err
• fix-error-msg
• fix-exit-prompt
• fix-generate
• fix-goreleaser
• fix-hcl-file-name
• fix-init
• fix-init-error
• fix-init-online
• fix-init-runtime
• fix-json-marshal
• fix-json-patch
• fix-json-patcher
• fix-k8s-apply
• fix-k8s-import
• fix-kcl-render
• fix-kpm-run
• fix-kusion-init
• fix-lint
• fix-lint-erros
• fix-lint-issues
• fix-logs-and-resources
• fix-makefile
• fix-maxunavailable
• fix-mod-push-os-arch
• fix-module-filename
• fix-module-pull-filenames
• fix-nil-pointer
• fix-npe
• fix-occasional-ut-failures-for-generator
• fix-openssl-error-in-kusion-image
• fix-opsrule
• fix-options
• fix-panic
• fix-patch-removal-env
• fix-patch-workload
• fix-patchers
• fix-path-join
• fix-plugin
• fix-plugin-log
• fix-preview-hint
• fix-ref
• fix-release-action
• fix-remove-dir
• fix-remove-tf-dir
• fix-run-cases
• fix-runs-optimizations
• fix-runtime
• fix-sec-ref-replace
• fix-secret-mask
• fix-some-bugs
• fix-spec-file-parse-error
• fix-svc
• fix-swagger
• fix-table-name-case
• fix-term-getterminalwidth
• fix-terraform-res-validation
• fix-tf-currency
• fix-tf-dir
• fix-tf-dry-run
• fix-tf-errors
• fix-tf-install
• fix-tf-refresh
• fix-tf-state-resource-name
• fix-tf-uts
• fix-tfjson
• fix-tfops-ut
• fix-tfruntime
• fix-third-party-readme
• fix-typo-in-action
• fix-unspecified-namespace-failure
• fix-unsupport-resource-type
• fix-ut
• fix-version
• fix-walk-log
• fix-watch-exit
• fix-workspace-cmd
• fix-workspace-update
• fix-wrong-output
• fix-ws-update
• fix/avoid-duplicate-generation
• fix/chmod-kcl-openapi
• fix/deps-focuspath
• fix/deps-ignore
• fix/fix-aws-database-generator
• fix/fix-state-backend
• fixDeadlink
• fixGithubActions
• fix_api
• fix_broken_link
• fix_customize_ns_issue
• fix_generator_issue
• fix_ginkgo_install_version
• fix_job_generator_issue
• fix_k8s_runtime
• fix_key
• fix_kusion_compile_terminal_output
• fix_mod_push_comments
• fix_mod_push_panic_issue
• fix_module
• fix_name
• fix_namespace_issue
• fix_probe_generator
• fix_push_generate_issue
• fix_readme_issue
• fix_swagger
• fix_tf_runtime_concurrent_execution
• fix_tf_state_id
• fix_uts
• fix_watch
• fix_workspace
• generator-interface
• get-workspace-modules
• git-cmd
• golangci-lint
• grpc-context
• handle-ctrlc
• howieyuen-patch-1
• huadong_20240606
• hybird-resources-operation
• ignore-fields
• ignore-fields-in-apply
• ignore-workloads
• impl_mod_push_cmd
• implement-variable-set
• import-resources
• import-tf-resource
• imported-resource
• init-template
• init-template-list
• intent
• jsonpatch
• kcp-init-develop
• kubeconfig-workspace
• kusion-build-use-workspace
• kusion-server
• kusion-watch
• kversion-br
• links
• list-template
• live-state-is-nil
• log-to-stdout
• main
• main-moudle
• makefile
• makefile-fix
• makefile-linter-fix
• mark-deprecated-worksapce-backend
• mask-preview-changes
• mask-secret
• maskSecret
• mkfile
• mod-add
• mod-download-filter
• mod-init
• mod-list
• mod-push
• mod-push-osarch
• module
• module-config
• module-design
• module-doc
• module-doc-interface
• module-grpc
• module-grpc-interface
• module-interface
• module-interface-patch
• module-list
• module-plugin-dir
• module-workload
• modules-proto
• network-def
• network-port
• network-refactor
• normalize-annotation
• oam
• operation-types
• ops-rule
• ops-rule-ws
• optimize-port-forwarding
• optimize-ui
• parse-kpm-version
• parse_dependency_in_preview
• patcher
• path-join
• plugin-api
• plugin-bug
• pr-max-lenght
• pretty
• preview-all
• preview-flag
• preview-output-json
• progressbar
• proto
• proto-runtime
• readme
• readme-cn
• readme-slack
• refacotor-workload-1222
• refact_api_structure
• refact_api_types
• refact_delete_cmd
• refact_preview_cmd
• refactor-backend
• refactor-diff-util
• refactor-dockerfile
• refactor-flags
• refactor-gendocs
• refactor-kcl-generator
• refactor-kcl-go
• refactor-kcl-openapi
• refactor-kusionctl
• refactor-models
• refactor-monitoring-with-workspace
• refactor-monkey-func
• refactor-oam-details
• refactor-old-state-storage
• refactor-old-statestorage
• refactor-printers
• refactor-readme
• refactor-resource-node
• refactor-runtime
• refactor-state
• refactor-workload
• refactor-workspace-usage
• refactor/update-database-generator
• refactor_runtime
• refactor_workload
• refect-generator-proposal-br
• refine-apply-watch
• refine-build-from-source-in-readme
• refine-cli-interactive-output
• refine-convertors
• refine-kdump-pkg
• refine-no-style-and-remove-no-prompt-cmd-opt
• refine-preview-result
• refine-relation
• refine-version-subcmd
• refine-watch
• refresh-cmd-doc
• refresh-cmd-docs
• refresh-docs
• refs/tags/v0.10.0
• refs/tags/v0.10.0-rc.1
• refs/tags/v0.11.0
• refs/tags/v0.11.0-rc.1
• refs/tags/v0.11.0-rc.2
• refs/tags/v0.11.1
• refs/tags/v0.11.1-rc.1
• refs/tags/v0.12.0
• refs/tags/v0.12.0-rc.1
• refs/tags/v0.12.0-rc.2
• refs/tags/v0.12.0-rc.3
• refs/tags/v0.12.0-rc.4
• refs/tags/v0.12.1
• refs/tags/v0.12.1-rc.1
• refs/tags/v0.12.1-rc.2
• refs/tags/v0.12.1-rc.3
• refs/tags/v0.13.0
• refs/tags/v0.13.0-alpha.1
• refs/tags/v0.13.0-alpha.2
• refs/tags/v0.13.0-alpha.3
• refs/tags/v0.14.0
• refs/tags/v0.14.0-rc.1
• refs/tags/v0.14.1-rc.2
• refs/tags/v0.15.0
• refs/tags/v0.15.0-rc.1
• refs/tags/v0.4.1
• refs/tags/v0.4.1-alpha.1
• refs/tags/v0.4.1-alpha.2
• refs/tags/v0.4.1-alpha.3
• refs/tags/v0.4.1-alpha.4
• refs/tags/v0.4.1-debug.1
• refs/tags/v0.4.1-debug.10
• refs/tags/v0.4.1-debug.11
• refs/tags/v0.4.1-debug.2
• refs/tags/v0.4.1-debug.3
• refs/tags/v0.4.1-debug.4
• refs/tags/v0.4.1-debug.5
• refs/tags/v0.4.1-debug.6
• refs/tags/v0.4.1-debug.7
• refs/tags/v0.4.1-debug.8
• refs/tags/v0.4.1-debug.9
• refs/tags/v0.4.2
• refs/tags/v0.4.2-alpha.1
• refs/tags/v0.4.3
• refs/tags/v0.4.4
• refs/tags/v0.5.0
• refs/tags/v0.5.1
• refs/tags/v0.5.2
• refs/tags/v0.5.3
• refs/tags/v0.5.3-rc.0
• refs/tags/v0.5.4-rc.0
• refs/tags/v0.5.4-rc.1
• refs/tags/v0.6.0
• refs/tags/v0.6.0-rc.1
• refs/tags/v0.6.1
• refs/tags/v0.6.1-rc.0
• refs/tags/v0.6.2
• refs/tags/v0.7.0
• refs/tags/v0.7.1
• refs/tags/v0.7.2
• refs/tags/v0.7.3
• refs/tags/v0.7.3-rc.0
• refs/tags/v0.7.4
• refs/tags/v0.8.0
• refs/tags/v0.8.1
• refs/tags/v0.8.1-rc.0
• refs/tags/v0.8.2
• refs/tags/v0.8.3-alpha.1
• refs/tags/v0.9.0
• refs/tags/v0.9.0-rc.1
• refs/tags/v0.9.0-rc.2
• refs/tags/v0.9.1
• refs/tags/v0.9.1-beta
• refs/tags/v0.9.1-rc
• refs/tags/v0.9.1-rc.2
• refs/tags/v1.0.3
• release
• release-0.7.4
• release-api
• release-model
• release-realize
• release-show
• release-storage
• release-validation
• remove-build-flags
• remove-depreacted
• remove-module-proto
• remove-server-cmd
• remove-unused-legal-file
• rename-doc
• rename-spec-to-intent
• rename_destory
• rename_external_secret_api
• rename_unchanged
• reorg
• reorg-generator
• reorganize_states
• rephrase-readme
• resource-patch
• resource-show
• resource_cmd
• retrive-kubeconfig-intent
• retrive_specified_type
• revert-kusion-flag
• revert-pulumi
• ruleset-generator
• runs-log-pretty
• runtime
• runtime-import
• s3-path-style
• save-unchanged-but-lived-resource
• scaffold-servitization
• scoop
• sdlc-readme
• search-to-url-params
• secret
• secret-store
• secret_generator_add_comments
• secret_generator_support_external_secret_type
• server-side-preview
• silent-log
• skip-destroy-imported-rs
• skip-unspecified-stacks
• skip-version-check
• skipSomelinkCheck
• sort
• spec-as-input
• spec-chore
• stack-in-generator
• star-history-2
• star-history-3
• state-backend-workspace
• state-model
• state-storages
• style
• support-concurrent-exec
• support-custom-writer-and-storage-for-apply-and-preview
• support-default-order-of-k8s-resources
• support-default-workspace
• support-env-remove
• support-k8s-crd
• support-magic-env-parser
• support-patch-removal
• support-port-forward-and-browser
• support-release-unlock
• tempTest
• terraform-config
• test/add-unit-tests-for-database-generator
• test/enable-watch-in-e2e-test
• tf-auto-install
• tf-runtime
• throw-dag-inner-errors
• tidy-mod
• tidy-state-storage
• translation/readme-hindi.md
• tune-labels-and-annotations
• ui
• unit-test
• unit-test-new
• unmarshal-kcl-union
• up-init
• up-release-metadata
• updat-makefile
• update-arch
• update-arch-img
• update-cli-doc
• update-cli-help-info
• update-collaboration-doc-img
• update-collaboratrion-doc
• update-compile-output
• update-contributing
• update-docker-file
• update-docs-for-add-installation-ways
• update-e2e-test
• update-goveralls
• update-help-info
• update-init
• update-init-cmd
• update-init-template
• update-internal-templates
• update-issue-template
• update-k8s-mod
• update-kpm
• update-kubeconfig-context
• update-kusion-cmd-docs
• update-kusion-destroy
• update-meta-flag
• update-mod-push
• update-port-forward
• update-preview
• update-product-hunt-badge
• update-project-stack-create
• update-quickstart
• update-read-me
• update-readme
• update-readme-demo
• update-readme-links
• update-readme-ref
• update-resource-handler
• update-scaffold-with-kpm
• update-stack-api
• update-state-storage
• update-svc-import
• update-ui-implement
• update-watch-hint
• update-workspace
• update-workspace-sdk
• update-yaml
• update_base_model
• update_cmd_construct
• update_contributing_guide
• update_engine_doc
• update_generate_cmd
• update_git_ignore
• update_kfile
• update_pod_generator
• update_readme
• update_secret_generator
• update_secret_generator_test_cases
• update_secret_store_providers
• update_secrets_apis
• update_state
• update_tf_runtime_workspace_in_stack
• upgrade-hint
• upgrade-kclvm-version
• upgrade-kpm
• upgrade_go_1.19
• usage-release
• use-generic-optimization-code
• use-kubeconfig-intent
• use-kusion-home
• use_core_v1_api
• use_core_v1_api_types
• use_new_api_pkg
• use_new_ui
• ut
• validate_payload
• vals
• version_validate
• viettelcloud-kms
• watch
• watch-appsv1
• watch-colla-set
• watch-ui
• watch-v1
• wd
• windows
• windows-install
• windows-scoop
• workflow_design
• workload
• workload-cli
• workload-modularize
• workload-not-mandatory
• workspace-cmd
• workspace-deprecated
• workspace-management
• workspace-management-proposal
• workspace-model
• workspace-operation
• workspace-storages
• workspace-switch
• workspace_api
• workspace_api_update
• ws-revert
• yaml-indent

refactor: add live state to ChangeStep to do 3-way diff if need