Skip to content

Commit

Permalink
Merge pull request #680 from carvel-dev/org-migration-0.54.x
Browse files Browse the repository at this point in the history
Change org and repository name in v0.54.x line
  • Loading branch information
kumaritanushree authored Jan 25, 2023
2 parents 5dc9a79 + b9d54e1 commit 22200f1
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- Thanks for sending a pull request! Here are some tips for you:
If this is your first time, please read our contributor guidelines: https://github.com/vmware-tanzu/carvel-kapp/blob/develop/CONTRIBUTING.md and developer guide https://github.com/vmware-tanzu/carvel-kapp/blob/develop/docs/dev.md
If this is your first time, please read our contributor guidelines: https://github.com/carvel-dev/kapp/blob/develop/CONTRIBUTING.md and developer guide https://github.com/carvel-dev/kapp/blob/develop/docs/dev.md
-->

#### What this PR does / why we need it:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/add-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ jobs:
steps:
- uses: actions/[email protected]
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 }}
2 changes: 1 addition & 1 deletion .github/workflows/inclusive-language-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/release-published.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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" }}'
4 changes: 2 additions & 2 deletions .github/workflows/trivy-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion GOVERNANCE.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -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.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ROADMAP.md
Original file line number Diff line number Diff line change
@@ -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.
34 changes: 17 additions & 17 deletions docs/dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions examples/rebase-pod-calico/README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/simple-app-example/README.md
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion examples/sts-alternative/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 22200f1

Please sign in to comment.