From b9d54e14e83b44f66ab32d502eb5a3933ee95bfd Mon Sep 17 00:00:00 2001 From: Praveen Rewar <8457124+praveenrewar@users.noreply.github.com> Date: Sat, 21 Jan 2023 15:42:16 +0530 Subject: [PATCH] Change org and repository name Signed-off-by: Praveen Rewar <8457124+praveenrewar@users.noreply.github.com> --- .github/pull_request_template.md | 2 +- .github/workflows/add-to-project.yml | 2 +- .../workflows/inclusive-language-check.yml | 2 +- .github/workflows/release-published.yml | 4 +-- .github/workflows/trivy-scan.yml | 4 +-- GOVERNANCE.md | 2 +- MAINTAINERS.md | 2 +- README.md | 6 ++-- ROADMAP.md | 2 +- docs/dev.md | 34 +++++++++---------- examples/rebase-pod-calico/README.md | 4 +-- examples/simple-app-example/README.md | 2 +- examples/sts-alternative/README.md | 2 +- 13 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 6267be160..0d384d7cc 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,6 +1,6 @@ #### What this PR does / why we need it: diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index ebf5334f0..14ce12563 100644 --- a/.github/workflows/add-to-project.yml +++ b/.github/workflows/add-to-project.yml @@ -14,5 +14,5 @@ jobs: steps: - uses: actions/add-to-project@v0.3.0 with: - project-url: https://github.com/orgs/vmware-tanzu/projects/16 + project-url: https://github.com/orgs/carvel-dev/projects/1 github-token: ${{ secrets.CARVEL_ADD_TO_PROJECT_TOKEN }} diff --git a/.github/workflows/inclusive-language-check.yml b/.github/workflows/inclusive-language-check.yml index 9bfceed87..5dee8fa39 100644 --- a/.github/workflows/inclusive-language-check.yml +++ b/.github/workflows/inclusive-language-check.yml @@ -7,4 +7,4 @@ on: jobs: check-inclusive-language: - uses: vmware-tanzu/carvel-release-scripts/.github/workflows/inclusive-language-check.yml@main + uses: carvel-dev/release-scripts/.github/workflows/inclusive-language-check.yml@main diff --git a/.github/workflows/release-published.yml b/.github/workflows/release-published.yml index 92240fd48..9674124e7 100644 --- a/.github/workflows/release-published.yml +++ b/.github/workflows/release-published.yml @@ -7,7 +7,7 @@ jobs: validate-github-action: runs-on: ubuntu-latest steps: - - uses: vmware-tanzu/carvel-setup-action@v1 + - uses: carvel-dev/setup-action@v1 with: only: kapp kapp: ${{ github.event.release.tag_name }} @@ -25,7 +25,7 @@ jobs: exit 1 fi - run: | - curl -X POST https://api.github.com/repos/vmware-tanzu/carvel-release-scripts/dispatches \ + curl -X POST https://api.github.com/repos/carvel-dev/release-scripts/dispatches \ -H 'Accept: application/vnd.github.everest-preview+json' \ -u ${{ secrets.carvel_bot_access_token }} \ --data '{"event_type": "kapp_released", "client_payload": { "tagName": "${{ github.event.release.tag_name }}", "repo": "${{ github.repository }}", "toolName": "kapp" }}' diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 5666f2d18..0f60e0d92 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -6,9 +6,9 @@ on: jobs: trivy-scan: - uses: vmware-tanzu/carvel-release-scripts/.github/workflows/trivy-scan.yml@main + uses: carvel-dev/release-scripts/.github/workflows/trivy-scan.yml@main with: - repo: vmware-tanzu/carvel-kapp + repo: carvel-dev/kapp tool: kapp goVersion: "1.19.5" secrets: diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 14b569404..31306a8b9 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -1,2 +1,2 @@ # kapp Governance -kapp governance can be found within the main [Carvel GitHub repo](https://github.com/vmware-tanzu/carvel) within the [GOVERNANCE.md](https://github.com/vmware-tanzu/carvel/blob/develop/GOVERNANCE.md) file. +kapp governance can be found within the main [Carvel GitHub repo](https://github.com/carvel-dev/carvel) within the [GOVERNANCE.md](https://github.com/carvel-dev/carvel/blob/develop/GOVERNANCE.md) file. diff --git a/MAINTAINERS.md b/MAINTAINERS.md index c68edf172..de4fb2751 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1,2 +1,2 @@ # kapp Maintainers -Maintainers for kapp can be found within the main [Carvel GitHub repo](https://github.com/vmware-tanzu/carvel) within the [MAINTAINERS.md](https://github.com/vmware-tanzu/carvel/blob/develop/MAINTAINERS.md) file. +Maintainers for kapp can be found within the main [Carvel GitHub repo](https://github.com/carvel-dev/carvel) within the [MAINTAINERS.md](https://github.com/carvel-dev/carvel/blob/develop/MAINTAINERS.md) file. diff --git a/README.md b/README.md index d7094438b..b0b176dc0 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ - Website: https://carvel.dev/kapp - Slack: [#carvel in Kubernetes slack](https://slack.kubernetes.io) - [Docs](docs/README.md) with topics about diff, apply, gitops, config, _blog posts and talks_ etc. -- Install: grab prebuilt binaries from the [Releases page](https://github.com/vmware-tanzu/carvel-kapp/releases) or [Homebrew Carvel tap](https://github.com/vmware-tanzu/homebrew-carvel). -- Backlog: [See what we're up to](https://github.com/orgs/vmware-tanzu/projects/16/views/1?filterQuery=repo%3A%22vmware-tanzu%2Fcarvel-kapp%22). +- Install: grab prebuilt binaries from the [Releases page](https://github.com/carvel-dev/kapp/releases) or [Homebrew Carvel tap](https://github.com/carvel-dev/homebrew). +- Backlog: [See what we're up to](https://github.com/orgs/carvel-dev/projects/1/views/1?filterQuery=repo:%22carvel-dev/kapp%22). `kapp` (pronounced: `kap`) CLI encourages Kubernetes users to manage resources in bulk by working with "Kubernetes applications" (sets of resources with the same label). It focuses on resource diffing, labeling, deployment and deletion. Unlike tools like Helm, `kapp` considers YAML templating and management of packages outside of its scope, though it works great with tools that generate Kubernetes configuration. @@ -40,7 +40,7 @@ Please join us during our online community meetings. Details can be found on our You can chat with us on Kubernetes Slack in the #carvel channel and follow us on Twitter at @carvel_dev. -Check out which organizations are using and contributing to Carvel: [Adopter's list](https://github.com/vmware-tanzu/carvel/blob/master/ADOPTERS.md) +Check out which organizations are using and contributing to Carvel: [Adopter's list](https://github.com/carvel-dev/carvel/blob/master/ADOPTERS.md) ## Development diff --git a/ROADMAP.md b/ROADMAP.md index a1a460a9c..3e59f1738 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,2 +1,2 @@ # kapp Roadmap -The roadmap details for kapp can be found within the main [Carvel GitHub repo](https://github.com/vmware-tanzu/carvel) within the [ROADMAP.md](https://github.com/vmware-tanzu/carvel/blob/develop/ROADMAP.md) file. +The roadmap details for kapp can be found within the main [Carvel GitHub repo](https://github.com/carvel-dev/carvel) within the [ROADMAP.md](https://github.com/carvel-dev/carvel/blob/develop/ROADMAP.md) file. diff --git a/docs/dev.md b/docs/dev.md index f7cfc1c90..3e21564b7 100644 --- a/docs/dev.md +++ b/docs/dev.md @@ -11,25 +11,25 @@ kubectl create ns $KAPP_E2E_NAMESPACE For those interested in extending and improving `kapp`, below is a quick reference on the structure of the source code: -- [.github/workflows/test-gh.yml](https://github.com/vmware-tanzu/carvel-kapp/blob/develop/.github/workflows/test-gh.yml) is a Github Action that runs build and unit tests when commits are pushed -- [hack](https://github.com/vmware-tanzu/carvel-kapp/tree/develop/hack) has build and test scripts -- [cmd/kapp](https://github.com/vmware-tanzu/carvel-kapp/blob/develop/cmd/kapp) is the entry package for main kapp binary -- [cmd/kapp-lambda-website](https://github.com/vmware-tanzu/carvel-kapp/blob/develop/cmd/kapp-lambda-website) is the entry package for AWS Lambda compatible binary that wraps `kapp website` command -- [pkg/kapp/cmd](https://github.com/vmware-tanzu/carvel-kapp/tree/develop/pkg/kapp/cmd) includes all kapp CLI commands (kapp.go is root command) - - [pkg/kapp/cmd/app](https://github.com/vmware-tanzu/carvel-kapp/tree/develop/pkg/kapp/cmd/app) includes all top level CLI commands (deploy, delete, etc.) -- [pkg/kapp/app](https://github.com/vmware-tanzu/carvel-kapp/tree/develop/pkg/kapp/app) package includes two types of app and details about them (such as app change tracking): +- [.github/workflows/test-gh.yml](https://github.com/carvel-dev/kapp/blob/develop/.github/workflows/test-gh.yml) is a Github Action that runs build and unit tests when commits are pushed +- [hack](https://github.com/carvel-dev/kapp/tree/develop/hack) has build and test scripts +- [cmd/kapp](https://github.com/carvel-dev/kapp/blob/develop/cmd/kapp) is the entry package for main kapp binary +- [cmd/kapp-lambda-website](https://github.com/carvel-dev/kapp/blob/develop/cmd/kapp-lambda-website) is the entry package for AWS Lambda compatible binary that wraps `kapp website` command +- [pkg/kapp/cmd](https://github.com/carvel-dev/kapp/tree/develop/pkg/kapp/cmd) includes all kapp CLI commands (kapp.go is root command) + - [pkg/kapp/cmd/app](https://github.com/carvel-dev/kapp/tree/develop/pkg/kapp/cmd/app) includes all top level CLI commands (deploy, delete, etc.) +- [pkg/kapp/app](https://github.com/carvel-dev/kapp/tree/develop/pkg/kapp/app) package includes two types of app and details about them (such as app change tracking): - `LabeledApp` which represents app based on user provided label - `RecordedApp` which represents app backed by `ConfigMap`. `RecordedApp` uses LabeledApp internally. -- [pkg/kapp/resources](https://github.com/vmware-tanzu/carvel-kapp/tree/develop/pkg/kapp/resources) package is responsible for parsing, fetching, and modifying k8s resources (represented through Resource interface and ResourceImpl) -- [pkg/kapp/diff](https://github.com/vmware-tanzu/carvel-kapp/tree/develop/pkg/kapp/diff) allows to diff two resources represented by Change object, and multiple resources via ChangeSet. **This package does not know anything about k8s.** -- [pkg/kapp/diffgraph](https://github.com/vmware-tanzu/carvel-kapp/tree/develop/pkg/kapp/diffgraph) applies deploy/delete order to set of changes. **This package does not know anything about k8s.** -- [pkg/kapp/clusterapply](https://github.com/vmware-tanzu/carvel-kapp/tree/develop/pkg/kapp/clusterapply) allow to apply diff to k8s cluster via ClusterChange object. - - [converged_resource.go](https://github.com/vmware-tanzu/carvel-kapp/blob/develop/pkg/kapp/clusterapply/converged_resource.go) tracks whether resource is in a _converged state_ e.g. `Deployment` has finished updating its `Pods`. Uses `resourcesmisc` package as part of its implementation. - - [add_or_update_change.go](https://github.com/vmware-tanzu/carvel-kapp/blob/develop/pkg/kapp/clusterapply/add_or_update_change.go) controls how resource is created or updated with necessary retry logic - - [delete_change.go](https://github.com/vmware-tanzu/carvel-kapp/blob/develop/pkg/kapp/clusterapply/delete_change.go) controls how resource is deleted -- [pkg/kapp/resourcesmisc](https://github.com/vmware-tanzu/carvel-kapp/tree/develop/pkg/kapp/resourcesmisc) contains objects for waiting on different resource types (e.g. Deployment, Service, Pod, etc.) -- [pkg/kapp/logs](https://github.com/vmware-tanzu/carvel-kapp/tree/develop/pkg/kapp/logs) supports log streaming for `kapp logs` command -- [test/e2e](https://github.com/vmware-tanzu/carvel-kapp/tree/develop/test/e2e) includes e2e tests that can run against any k8s cluster. +- [pkg/kapp/resources](https://github.com/carvel-dev/kapp/tree/develop/pkg/kapp/resources) package is responsible for parsing, fetching, and modifying k8s resources (represented through Resource interface and ResourceImpl) +- [pkg/kapp/diff](https://github.com/carvel-dev/kapp/tree/develop/pkg/kapp/diff) allows to diff two resources represented by Change object, and multiple resources via ChangeSet. **This package does not know anything about k8s.** +- [pkg/kapp/diffgraph](https://github.com/carvel-dev/kapp/tree/develop/pkg/kapp/diffgraph) applies deploy/delete order to set of changes. **This package does not know anything about k8s.** +- [pkg/kapp/clusterapply](https://github.com/carvel-dev/kapp/tree/develop/pkg/kapp/clusterapply) allow to apply diff to k8s cluster via ClusterChange object. + - [converged_resource.go](https://github.com/carvel-dev/kapp/blob/develop/pkg/kapp/clusterapply/converged_resource.go) tracks whether resource is in a _converged state_ e.g. `Deployment` has finished updating its `Pods`. Uses `resourcesmisc` package as part of its implementation. + - [add_or_update_change.go](https://github.com/carvel-dev/kapp/blob/develop/pkg/kapp/clusterapply/add_or_update_change.go) controls how resource is created or updated with necessary retry logic + - [delete_change.go](https://github.com/carvel-dev/kapp/blob/develop/pkg/kapp/clusterapply/delete_change.go) controls how resource is deleted +- [pkg/kapp/resourcesmisc](https://github.com/carvel-dev/kapp/tree/develop/pkg/kapp/resourcesmisc) contains objects for waiting on different resource types (e.g. Deployment, Service, Pod, etc.) +- [pkg/kapp/logs](https://github.com/carvel-dev/kapp/tree/develop/pkg/kapp/logs) supports log streaming for `kapp logs` command +- [test/e2e](https://github.com/carvel-dev/kapp/tree/develop/test/e2e) includes e2e tests that can run against any k8s cluster. ### Design Principles diff --git a/examples/rebase-pod-calico/README.md b/examples/rebase-pod-calico/README.md index a05ab897a..b5bd3ed1e 100644 --- a/examples/rebase-pod-calico/README.md +++ b/examples/rebase-pod-calico/README.md @@ -1,8 +1,8 @@ # Rebase rules for Pods on Calico -Kapp will [merge](https://github.com/vmware-tanzu/carvel-kapp/blob/develop/docs/merge-method.md) resources +Kapp will [merge](https://github.com/carvel-dev/kapp/blob/develop/docs/merge-method.md) resources with what's in the cluster to determine when to apply changes. The merge can be customized -with [rebaseRules](https://github.com/vmware-tanzu/carvel-kapp/blob/develop/docs/config.md). +with [rebaseRules](https://github.com/carvel-dev/kapp/blob/develop/docs/config.md). In the case of Calico pods get an annotation with their IP address in it. By default this annotation will be removed by kapp during a deployment, which will fail as an invalid pod diff --git a/examples/simple-app-example/README.md b/examples/simple-app-example/README.md index 6af462c26..ccf5a0a28 100644 --- a/examples/simple-app-example/README.md +++ b/examples/simple-app-example/README.md @@ -1 +1 @@ -Based on https://github.com/vmware-tanzu/carvel-simple-app-on-kubernetes/tree/develop/config-step-1-minimal +Based on https://github.com/carvel-dev/simple-app-on-kubernetes/tree/develop/config-step-1-minimal diff --git a/examples/sts-alternative/README.md b/examples/sts-alternative/README.md index 0c6da1482..a523eee71 100644 --- a/examples/sts-alternative/README.md +++ b/examples/sts-alternative/README.md @@ -17,7 +17,7 @@ Highlights: - target specific Pods via DNS via per-Pod created Service (e.g. redis-0 is a Service) - since we deployed this via one-off kapp invocation if Pod gets deleted from the cluster, it will not be recreated - to address this, make sure that kapp deploy is continiously executed - - simplest way to do that is to use [kapp-controller](https://github.com/vmware-tanzu/carvel-kapp-controller) + - simplest way to do that is to use [kapp-controller](https://github.com/carvel-dev/kapp-controller) - (...it would be nice to create a tiny dedicated controller that can keep one named Pod alive) Note: this example uses Redis, but I actually did not bother configuring Redis replication between Pods since this was not the point of this example.