Skip to content

Commit

Permalink
Merge pull request #1 from reconcilerio/migration
Browse files Browse the repository at this point in the history
Migrate to reconciler.io/runtime
  • Loading branch information
scothis authored Mar 13, 2024
2 parents 7342347 + 2ce2d17 commit 7cc9b34
Show file tree
Hide file tree
Showing 76 changed files with 1,231 additions and 505 deletions.
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ updates:
interval: daily
open-pull-requests-limit: 10
reviewers:
- squeedee
- scothis
- mamachanko
- package-ecosystem: gomod
directory: "/"
Expand All @@ -18,13 +18,13 @@ updates:
interval: daily
open-pull-requests-limit: 10
reviewers:
- squeedee
- scothis
- mamachanko
- package-ecosystem: gomod
directory: "/hack"
schedule:
interval: daily
open-pull-requests-limit: 10
reviewers:
- squeedee
- scothis
- mamachanko
4 changes: 2 additions & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Our Pledge

We as members, contributors, and leaders pledge to make participation in reconciler-runtime project and our
We as members, contributors, and leaders pledge to make participation in reconciler.io project and our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
Expand Down Expand Up @@ -59,7 +59,7 @@ representative at an online or offline event.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at oss-coc@vmware.com.
reported to the community leaders responsible for enforcement at conduct@reconciler.io.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
Expand Down
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@


# Contributing to reconciler-runtime
# Contributing to reconciler.io runtime

The reconciler-runtime project team welcomes contributions from the community. If you wish to contribute code and you have not signed our contributor license agreement (CLA), our bot will update the issue when you open a Pull Request. For any questions about the CLA process, please refer to our [FAQ](https://cla.vmware.com/faq).
The reconciler.io runtime project team welcomes contributions from the community. A contributor license agreement (CLA) is not required. You own full rights to your contribution and agree to license the work to the community under the Apache License v2.0, via a [Developer Certificate of Origin (DCO)](https://developercertificate.org).

## Contribution Flow

Expand All @@ -17,20 +17,20 @@ This is a rough outline of what a contributor's workflow looks like:
Example:

``` shell
git remote add upstream https://github.com/vmware/reconciler-runtime.git
git checkout -b my-new-feature master
git remote add upstream https://github.com/reconcilerio/runtime.git
git checkout -b my-new-feature main
git commit -a
git push origin my-new-feature
```

### Staying In Sync With Upstream

When your branch gets out of sync with the vmware/master branch, use the following to update:
When your branch gets out of sync with the reconcilerio/main branch, use the following to update:

``` shell
git checkout my-new-feature
git fetch -a
git pull --rebase upstream master
git pull --rebase upstream main
git push --force-with-lease origin my-new-feature
```

Expand All @@ -53,7 +53,7 @@ If you need to squash changes into an earlier commit, you can use:
``` shell
git add .
git commit --fixup <commit>
git rebase -i --autosquash master
git rebase -i --autosquash main
git push --force-with-lease origin my-new-feature
```

Expand Down
380 changes: 201 additions & 179 deletions LICENSE

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Maintainers

* Rasheed Abdul-Aziz, [squeedee](https://github.com/squeedee)
* Max Brauer, [mamachanko](https://github.com/mamachanko)

# Emeritus maintainers

* Scott Andrews, [scothis](https://github.com/scothis)
* Max Brauer, [mamachanko](https://github.com/mamachanko)
16 changes: 12 additions & 4 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
reconciler-runtime
Copyright (c) 2020 VMware, Inc. All Rights Reserved.
Reconciler.io runtime
Copyright 2024 the original author or authors.

This product is licensed to you under the Apache 2.0 license (the "License"). You may not use this product except in compliance with the Apache 2.0 License.
Reconciler.io runtime is a fork of reconciler-runtime (https://github.com/vmware-labs/reconciler-runtime),
consumed under the Apache 2.0 license.
Copyright 2019-2024 VMware, Inc. All Rights Reserved.

This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
The initial development of some parts of the framework, which are copied from, derived from, or
inspired by Knative (https://knative.dev/).
Copyright 2019 The Knative Authors

This product may include a number of subcomponents with separate copyright notices and license terms.
Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license,
as noted in the LICENSE file.
Loading

0 comments on commit 7cc9b34

Please sign in to comment.