Skip to content

Commit

Permalink
Merge pull request #1076 from carvel-dev/org-migration-0.44.x
Browse files Browse the repository at this point in the history
Change org and repository name in 0.44.x line
  • Loading branch information
kumaritanushree authored Jan 30, 2023
2 parents a04ffe3 + 7b56137 commit 5e9f4cf
Show file tree
Hide file tree
Showing 24 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/release-checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ assignees: ''

## Releasing a new minor / major:
- [ ] OSS Release
- [ ] [Releasing via workflow](https://github.com/vmware-tanzu/carvel-kapp-controller/blob/develop/docs/dev.md#release).
- [ ] [Releasing via workflow](https://github.com/carvel-dev/kapp-controller/blob/develop/docs/dev.md#release).
- [ ] Close any GitHub issues that have been delivered.
- [ ] Add a link to the release on the issue.
- [ ] Communicate to the kctrl maintainers, so they can update the release notes.
Expand All @@ -33,4 +33,4 @@ assignees: ''
- [ ] `git push origin v0.38.<next-patch-version>`.
- [ ] Make a PR.
- [ ] Once approved, merge the changes back to the `v0.38.x` branch and `git push` the branch and delete your temporary branch used in the PR.
- [ ] To Release: follow the instructions FROM THE BRANCH YOU ARE UPDATING at `docs/dev.md#release` in the repository. These will contain the relevant steps at each point of time in the project's history, e.g when updating `v0.25.x` the url will look like: https://github.com/vmware-tanzu/carvel-kapp-controller/blob/v0.25.x/docs/dev.md#release
- [ ] To Release: follow the instructions FROM THE BRANCH YOU ARE UPDATING at `docs/dev.md#release` in the repository. These will contain the relevant steps at each point of time in the project's history, e.g when updating `v0.25.x` the url will look like: https://github.com/carvel-dev/kapp-controller/blob/v0.25.x/docs/dev.md#release
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-controller/blob/develop/CONTRIBUTING.md and developer guide https://github.com/vmware-tanzu/carvel-kapp-controller/blob/develop/docs/dev.md
If this is your first time, please read our contributor guidelines: https://github.com/carvel-dev/kapp-controller/blob/develop/CONTRIBUTING.md and developer guide https://github.com/carvel-dev/kapp-controller/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
2 changes: 1 addition & 1 deletion .github/workflows/release-process.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: ./hack/install-deps.sh

- name: Install imgpkg
uses: vmware-tanzu/carvel-setup-action@v1
uses: carvel-dev/setup-action@v1
with:
only: imgpkg

Expand Down
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: kctrl
kctrl: ${{ 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": "kctrl_released", "client_payload": { "tagName": "${{ github.event.release.tag_name }}", "repo": "${{ github.repository }}", "toolName": "kctrl" }}'
2 changes: 1 addition & 1 deletion .github/workflows/test-kctrl-gh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
with:
fetch-depth: 0
- name: Install Carvel Tools
uses: vmware-tanzu/carvel-setup-action@v1
uses: carvel-dev/setup-action@v1
with:
only: ytt, kbld, imgpkg, vendir, kapp
- name: Run Tests
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/trivy-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
id: latest-sha
run: |
# Get the latest released docker image sha
curl -sL https://api.github.com/repos/vmware-tanzu/carvel-kapp-controller/releases/latest | jq -r '.assets[] | select(.name | contains("release.yml")).browser_download_url' | wget -i -
curl -sL https://api.github.com/repos/carvel-dev/kapp-controller/releases/latest | jq -r '.assets[] | select(.name | contains("release.yml")).browser_download_url' | wget -i -
echo ::set-output name=image::$(yq eval '.spec.template.spec.containers[0].image' release.yml -N -oj | jq 'select(. != null)' -r)
echo ::set-output name=tag::$(curl -sL https://api.github.com/repos/vmware-tanzu/carvel-kapp-controller/releases/latest | jq -r '.tag_name')
echo ::set-output name=tag::$(curl -sL https://api.github.com/repos/carvel-dev/kapp-controller/releases/latest | jq -r '.tag_name')
- name: Install Trivy
run: |
# https://aquasecurity.github.io/trivy/v0.18.3/installation/
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
echo "the curl reply was:"
cat cves.txt
}
curl https://api.github.com/repos/vmware-tanzu/carvel-kapp-controller/code-scanning/alerts \
curl https://api.github.com/repos/carvel-dev/kapp-controller/code-scanning/alerts \
--header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' > cves.txt
cat cves.txt| jq '.[] | select(.state == "dismissed" or .state == "closed" or .state == "fixed") | .rule.id' | tr -d '"' > .trivyignore
- name: Run Trivy Reports
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
if: steps.cve-summary.outputs.summary != ''
uses: slackapi/[email protected]
with:
slack-message: "New CVEs found! Check https://github.com/vmware-tanzu/carvel-kapp-controller/security/code-scanning for details \n ${{ steps.cve-summary.outputs.summary }}"
slack-message: "New CVEs found! Check https://github.com/carvel-dev/kapp-controller/security/code-scanning for details \n ${{ steps.cve-summary.outputs.summary }}"
channel-id: C010XR15VHU
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ jobs:
minikube start --driver=docker
eval $(minikube docker-env --shell=bash)
kapp deploy -a kc -f https://github.com/vmware-tanzu/carvel-kapp-controller/releases/latest/download/release.yml -y
kapp deploy -a kc -f https://github.com/carvel-dev/kapp-controller/releases/latest/download/release.yml -y
./hack/deploy.sh
2 changes: 1 addition & 1 deletion GOVERNANCE.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# kapp-controller Governance
kapp-controller 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-controller 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-controller Maintainers
Maintainers for kapp-controller 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-controller 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 @@ -6,7 +6,7 @@ Kubernetes native continuous delivery and package management experience through

<p>
<a href="https://carvel.dev/kapp-controller/docs/latest">Documentation</a> ·
<a href="https://github.com/orgs/vmware-tanzu/projects/16/views/1?filterQuery=repo%3A%22vmware-tanzu%2Fcarvel-kapp-controller%22">Backlog</a> ·
<a href="https://github.com/orgs/carvel-dev/projects/1/views/1?filterQuery=repo%3A%22carvel-dev%2Fkapp-controller%22">Backlog</a> ·
<a href="https://kubernetes.slack.com/archives/CH8KCCKA5">Slack</a> ·
<a href="https://twitter.com/carvel_dev">Twitter</a>
</p>
Expand All @@ -31,7 +31,7 @@ Kubernetes native continuous delivery and package management experience through

Check out our [contributing guidelines](CONTRIBUTING.md).

First time contributing? Welcome! We are excited to support you, we have created a [list of good issues to get started](https://github.com/vmware-tanzu/carvel-kapp-controller/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22).
First time contributing? Welcome! We are excited to support you, we have created a [list of good issues to get started](https://github.com/carvel-dev/kapp-controller/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22).

Detailed instructions on how to setup and test locally can be found in our [developer guide](docs/dev.md).

Expand All @@ -42,4 +42,4 @@ 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)
2 changes: 1 addition & 1 deletion ROADMAP.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# kapp-controller Roadmap
The roadmap details for kapp-controller 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-controller 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.
2 changes: 1 addition & 1 deletion cli/pkg/kctrl/cmd/package/installed/create_or_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ func (o *CreateOrUpdateOptions) unpauseReconciliation(client kcclient.Interface)

// Waits for the App CR created by the package installation to pick up it's paused status
// TODO: Have common place for waiting logic and refactor based on
// https://github.com/vmware-tanzu/carvel-kapp-controller/issues/639
// https://github.com/carvel-dev/kapp-controller/issues/639
func (o *CreateOrUpdateOptions) waitForAppPause(client kcclient.Interface) error {
if err := wait.Poll(o.WaitFlags.CheckInterval, o.WaitFlags.Timeout, func() (done bool, err error) {
appResource, err := client.KappctrlV1alpha1().Apps(o.NamespaceFlags.Name).Get(context.Background(), o.Name, metav1.GetOptions{})
Expand Down
2 changes: 1 addition & 1 deletion cli/pkg/kctrl/cmd/package/installed/pause_or_kick.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ func (o *PauseOrKickOptions) waitForPackageInstallReconciliation(client kcclient
return false, nil
}
// Temporary workaround so that we do not pick up stale conditions
// To be removed on resolution of: https://github.com/vmware-tanzu/carvel-kapp-controller/issues/639
// To be removed on resolution of: https://github.com/carvel-dev/kapp-controller/issues/639
// Poll interval to be reverted to 1s post removal
if appResource.Generation != appResource.Status.ObservedGeneration {
return false, nil
Expand Down
2 changes: 1 addition & 1 deletion cli/pkg/kctrl/cmd/package/release/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func (o *ReleaseOptions) releaseResources(appSpec kcv1alpha1.AppSpec, pkgBuild b
func generateValuesSchema(pkgBuild buildconfigs.PackageBuild) (*kcdatav1alpha1.ValuesSchema, error) {
if pkgBuild.Spec.Template.Spec.App.Spec.Template != nil {
// As of today, PackageInstall values file is applicable only for the first templating step.
// https://github.com/vmware-tanzu/carvel-kapp-controller/blob/develop/pkg/packageinstall/app.go#L103
// https://github.com/carvel-dev/kapp-controller/blob/develop/pkg/packageinstall/app.go#L103
templateStage := pkgBuild.Spec.Template.Spec.App.Spec.Template[0]
switch {
case templateStage.HelmTemplate != nil:
Expand Down
2 changes: 1 addition & 1 deletion cli/test/e2e/pkgi_values_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ foo: bar
})

// TODO: Add check for ensuring that we wait for reconciliation when secrets are updated
// When https://github.com/vmware-tanzu/carvel-kapp-controller/issues/670 is resolved
// When https://github.com/carvel-dev/kapp-controller/issues/670 is resolved

logger.Section("Updating values config for test package", func() {
out, err := kappCtrl.RunWithOpts([]string{"package", "installed", "update", "--package-install", pkgiName, "--values-file", "-"}, RunOpts{StdinReader: strings.NewReader(valuesFile)})
Expand Down
2 changes: 1 addition & 1 deletion config-release/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
---
push_images: true
image_cache: false
image_repo: ghcr.io/vmware-tanzu/carvel-kapp-controller
image_repo: ghcr.io/carvel-dev/kapp-controller
platform: "linux/amd64,linux/arm64"
12 changes: 6 additions & 6 deletions docs/dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ You will need the following tools to build and deploy kapp-controller:
For linux/mac users, all the tools below can be installed by running `./hack/install-deps.sh`.

For windows users, please download the binaries from the respective GitHub repositories:
* https://github.com/vmware-tanzu/carvel-ytt
* https://github.com/vmware-tanzu/carvel-kbld
* https://github.com/vmware-tanzu/carvel-kapp
* https://github.com/carvel-dev/ytt
* https://github.com/carvel-dev/kbld
* https://github.com/carvel-dev/kapp

### Build

Expand All @@ -39,8 +39,8 @@ things up.

#### Non-minikube environment

1. Change the [push_images property](https://github.com/vmware-tanzu/carvel-kapp-controller/blob/develop/config/values.yml#L10) to true
2. Change the [image_repo property](https://github.com/vmware-tanzu/carvel-kapp-controller/blob/develop/config/values.yml#L12) to the location to push the kapp-controller image
1. Change the [push_images property](https://github.com/carvel-dev/kapp-controller/blob/develop/config/values.yml#L10) to true
2. Change the [image_repo property](https://github.com/carvel-dev/kapp-controller/blob/develop/config/values.yml#L12) to the location to push the kapp-controller image
3. Run `./hack/deploy.sh`

*Note:* As above, while iterating you may prefer to run
Expand Down Expand Up @@ -95,7 +95,7 @@ toolchain `go test ./test/bench/... -bench=.`

Benchmarks run on develop branch are
graphed in [github
pages](https://vmware-tanzu.github.io/carvel-kapp-controller/dev/bench/index.html).
pages](https://carvel-dev.github.io/kapp-controller/dev/bench/index.html).

### Profiling
1.) Enable profiling by editing config/values.yaml and setting `dangerous_enable_pprof`
Expand Down
2 changes: 1 addition & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Since you need to provide service account for App CRs, we've included two common
- https://github.com/vmware-tanzu/carvel-kapp-controller/blob/master/examples/rbac/cluster-admin.yml: It creates `cluster-admin-sa` service account within `default` namespace that allows to change _any_ resource in the cluster. (Example usage: `istio-knative.yml`)

```bash
$ kapp deploy -a default-ns-rbac -f https://raw.githubusercontent.com/vmware-tanzu/carvel-kapp-controller/develop/examples/rbac/default-ns.yml
$ kapp deploy -a default-ns-rbac -f https://raw.githubusercontent.com/carvel-dev/kapp-controller/develop/examples/rbac/default-ns.yml
```

Once that's done, deploy any example in this repo.
4 changes: 2 additions & 2 deletions examples/local-kind-environment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ Ours is slightly updated, but original script can be found [here.](https://raw.g
Install the latest release of `kapp-controller`:

```sh
kubectl apply -f https://github.com/vmware-tanzu/carvel-kapp-controller/releases/latest/download/release.yml
kubectl apply -f https://github.com/carvel-dev/kapp-controller/releases/latest/download/release.yml
```

### install RBAC for admin SA account

```
kubectl apply -f https://raw.githubusercontent.com/vmware-tanzu/carvel-kapp-controller/develop/examples/rbac/cluster-admin.yml
kubectl apply -f https://raw.githubusercontent.com/carvel-dev/kapp-controller/develop/examples/rbac/cluster-admin.yml
```

## Hack the gibson
Expand Down
2 changes: 1 addition & 1 deletion hack/secretgen-controller.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
deploy_secretgen-controller() {
if [ "$KAPPCTRL_E2E_SECRETGEN_CONTROLLER" == "true" ]; then
echo "Deploying secretgen-controller..."
kapp deploy -a sg -f https://github.com/vmware-tanzu/carvel-secretgen-controller/releases/download/v0.7.1/release.yml -c -y
kapp deploy -a sg -f https://github.com/carvel-dev/secretgen-controller/releases/download/v0.7.1/release.yml -c -y
else
echo "Skipping secretgen-controller deployment"
fi
Expand Down
2 changes: 1 addition & 1 deletion hack/version-util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# the implicit contract is that our git tags will be in ~semver (three-part) format and prefaced with the letter 'v'.
# this contract is required by the goreleaser tool and used throughout Carvel suite.

# git tag version extraction graciously provided by https://github.com/vmware-tanzu/carvel-imgpkg/blob/develop/hack/build-binaries.sh
# git tag version extraction graciously provided by https://github.com/carvel-dev/imgpkg/blob/develop/hack/build-binaries.sh
function get_latest_git_tag {
git describe --tags | grep -Eo 'v[0-9]+\.[0-9]+\.[0-9]+(-alpha\.[0-9]+)?'
}
Expand Down
2 changes: 1 addition & 1 deletion package-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
- .imgpkg/images.yml
export:
- imgpkgBundle:
image: ghcr.io/vmware-tanzu/carvel-kapp-controller-package-bundle
image: ghcr.io/carvel-dev/kapp-controller-package-bundle
useKbldImagesLock: false
includePaths:
- config
Expand Down

0 comments on commit 5e9f4cf

Please sign in to comment.