From f61226fad58d39a7ede5f1e4575d62ab1f8ff37e Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Tue, 20 Jun 2023 01:24:48 -0300 Subject: [PATCH] chore(ci): Change default branch to `main` - Fixes #4271 --- .github/ISSUE_TEMPLATE/bug_report.yml | 4 ++-- .github/ISSUE_TEMPLATE/enhancement.yml | 4 ++-- .github/ISSUE_TEMPLATE/task.yml | 4 ++-- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- .github/workflows/build.yml | 2 +- .github/workflows/e2e-tests.yml | 2 +- .github/workflows/gobuild.yml | 2 +- .github/workflows/javadocs.yml | 2 +- .github/workflows/sonar.yml | 2 +- .github/workflows/style-checks.yml | 2 +- .github/workflows/windows-build.yml | 2 +- CHANGELOG.md | 2 +- CONTRIBUTING.md | 2 +- README.md | 2 +- doc/CHEATSHEET.md | 2 +- .../io/fabric8/kubernetes/client/dsl/CreateOrReplaceable.java | 2 +- .../java/io/fabric8/kubernetes/client/dsl/Replaceable.java | 4 ++-- .../io/fabric8/kubernetes/client/informers/cache/Indexer.java | 2 +- .../client/informers/impl/SharedInformerFactoryImpl.java | 2 +- .../client/informers/impl/cache/ProcessorListener.java | 2 +- .../client/informers/impl/cache/SharedProcessor.java | 2 +- 21 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index dd1baccea46..dc60aa63cb1 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -29,8 +29,8 @@ body: Useful Links: - - 📄 Documentation: https://github.com/fabric8io/kubernetes-client/blob/master/doc/CHEATSHEET.md - - 📝 Contributing: https://github.com/fabric8io/kubernetes-client/blob/master/CONTRIBUTING.md + - 📄 Documentation: https://github.com/fabric8io/kubernetes-client/blob/main/doc/CHEATSHEET.md + - 📝 Contributing: https://github.com/fabric8io/kubernetes-client/blob/main/CONTRIBUTING.md - type: textarea diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml index 907c52e4fb0..821b61a15d8 100644 --- a/.github/ISSUE_TEMPLATE/enhancement.yml +++ b/.github/ISSUE_TEMPLATE/enhancement.yml @@ -29,8 +29,8 @@ body: Useful Links: - - 📄 Documentation: https://github.com/fabric8io/kubernetes-client/blob/master/doc/CHEATSHEET.md - - 📝 Contributing: https://github.com/fabric8io/kubernetes-client/blob/master/CONTRIBUTING.md + - 📄 Documentation: https://github.com/fabric8io/kubernetes-client/blob/main/doc/CHEATSHEET.md + - 📝 Contributing: https://github.com/fabric8io/kubernetes-client/blob/main/CONTRIBUTING.md - type: textarea diff --git a/.github/ISSUE_TEMPLATE/task.yml b/.github/ISSUE_TEMPLATE/task.yml index 9cbcb8cfbfd..7f3ab956e15 100644 --- a/.github/ISSUE_TEMPLATE/task.yml +++ b/.github/ISSUE_TEMPLATE/task.yml @@ -29,8 +29,8 @@ body: Useful Links: - - 📄 Documentation: https://github.com/fabric8io/kubernetes-client/blob/master/doc/CHEATSHEET.md - - 📝 Contributing: https://github.com/fabric8io/kubernetes-client/blob/master/CONTRIBUTING.md + - 📄 Documentation: https://github.com/fabric8io/kubernetes-client/blob/main/doc/CHEATSHEET.md + - 📝 Contributing: https://github.com/fabric8io/kubernetes-client/blob/main/CONTRIBUTING.md - type: textarea diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d84d7bf1025..9ab83f04ac6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -18,9 +18,9 @@ What types of changes does your code introduce? Put an `x` in all the boxes that ## Checklist - [ ] Code contributed by me aligns with current project license: [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0) - - [ ] I Added [CHANGELOG](https://github.com/fabric8io/kubernetes-client/blob/master/CHANGELOG.md) entry regarding this change + - [ ] I Added [CHANGELOG](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md) entry regarding this change - [ ] I have implemented unit tests to cover my changes - - [ ] I have added/updated the [javadocs](https://www.javadoc.io/doc/io.fabric8/kubernetes-client/latest/index.html) and other [documentation](https://github.com/fabric8io/kubernetes-client/blob/master/doc/CHEATSHEET.md) accordingly + - [ ] I have added/updated the [javadocs](https://www.javadoc.io/doc/io.fabric8/kubernetes-client/latest/index.html) and other [documentation](https://github.com/fabric8io/kubernetes-client/blob/main/doc/CHEATSHEET.md) accordingly - [ ] No new bugs, code smells, etc. in [SonarCloud](https://sonarcloud.io/dashboard?id=fabric8io_kubernetes-client) report - [ ] I tested my code in Kubernetes - [ ] I tested my code in OpenShift diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82d55646cf9..e61b6541fe7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ on: workflow_dispatch: push: branches: - - master + - main pull_request: paths-ignore: - 'doc/**' diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 6211e760986..ee188bae3b2 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -20,7 +20,7 @@ on: workflow_dispatch: push: branches: - - master + - main pull_request: paths-ignore: - 'doc/**' diff --git a/.github/workflows/gobuild.yml b/.github/workflows/gobuild.yml index 5a31f128c3a..72d63143cd6 100644 --- a/.github/workflows/gobuild.yml +++ b/.github/workflows/gobuild.yml @@ -19,7 +19,7 @@ name: Go Build on: push: branches: - - master + - main pull_request: paths-ignore: - 'doc/**' diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml index 1134422ef42..870e616c67c 100644 --- a/.github/workflows/javadocs.yml +++ b/.github/workflows/javadocs.yml @@ -22,7 +22,7 @@ env: on: push: branches: - - master + - main pull_request: paths-ignore: - 'doc/**' diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index bf229a4b062..c4198c80551 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -22,7 +22,7 @@ env: on: push: branches: - - master + - main pull_request: paths-ignore: - 'doc/**' diff --git a/.github/workflows/style-checks.yml b/.github/workflows/style-checks.yml index b1a7415ac94..f7c99975d36 100644 --- a/.github/workflows/style-checks.yml +++ b/.github/workflows/style-checks.yml @@ -22,7 +22,7 @@ env: on: push: branches: - - master + - main pull_request: concurrency: diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 1cf561394b7..7b3c4a977d5 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -20,7 +20,7 @@ on: workflow_dispatch: push: branches: - - master + - main pull_request: paths-ignore: - 'doc/**' diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f57be19032..80f06508fae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1378,7 +1378,7 @@ _**Note**_: ``` public class Animals extends CustomResource implements Namespaced { ... } ``` - You can also checkout an example in our test suite for this: [PodSet.java](https://github.com/fabric8io/kubernetes-client/blob/master/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/PodSet.java#L22) + You can also checkout an example in our test suite for this: [PodSet.java](https://github.com/fabric8io/kubernetes-client/blob/main/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/PodSet.java#L22) ### 4.10.1 (2020-05-06) #### Bugs diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ca2b71c04b2..bd2c29b6112 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -68,7 +68,7 @@ mvn -Pitests -pl kubernetes-itests verify -Dtest="io.fabric8.openshift.**" ``` #### Other Requirements - * If adding a new feature or fixing some bug, please update the [CHANGELOG.md](https://github.com/fabric8io/kubernetes-client/blob/master/CHANGELOG.md), + * If adding a new feature or fixing some bug, please update the [CHANGELOG.md](https://github.com/fabric8io/kubernetes-client/blob/main/CHANGELOG.md), * Make sure you add the license headers at top of every new source file you add while implementing the feature. You can do so by hitting `mvn -N license:format` command. #### Commit your work diff --git a/README.md b/README.md index 73faffcc838..ac20ced2214 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ This client provides access to the full [Kubernetes](http://kubernetes.io/) & - [Who Uses Fabric8 Kubernetes Client?](#who-uses-kubernetes--openshift-java-client) - [Kubernetes Operators in Java Written using Fabric8 Kubernetes Client](./doc/KubernetesOperatorsInJavaWrittenUsingFabric8.md) - [Kubernetes and Red Hat OpenShift Compatibility Matrix](#compatibility-matrix) -- [Kubernetes Client CHEAT SHEET](https://github.com/fabric8io/kubernetes-client/blob/master/doc/CHEATSHEET.md) +- [Kubernetes Client CHEAT SHEET](https://github.com/fabric8io/kubernetes-client/blob/main/doc/CHEATSHEET.md) - [Kubectl Java Equivalents](#kubectl-java-equivalents) - [FAQs](doc/FAQ.md) - which includes details about project dependencies. diff --git a/doc/CHEATSHEET.md b/doc/CHEATSHEET.md index 80575de6589..4aa9220de5a 100644 --- a/doc/CHEATSHEET.md +++ b/doc/CHEATSHEET.md @@ -2153,7 +2153,7 @@ SharedIndexInformer podInformer = client.pods().inNamespace("default").info logger.info("Informer initialized."); ``` -- Create Namespaced Informer for a Custom Resource(**Note:** Your CustomResource POJO must implement `Namespaced` interface like the one used in this example: [Dummy.java](https://github.com/fabric8io/kubernetes-client/blob/master/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/crds/Dummy.java)) +- Create Namespaced Informer for a Custom Resource(**Note:** Your CustomResource POJO must implement `Namespaced` interface like the one used in this example: [Dummy.java](https://github.com/fabric8io/kubernetes-client/blob/main/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/crds/Dummy.java)) You should have your CustomResource type POJO annotated with group, version fields with respect to your CRD: ```java import io.fabric8.kubernetes.api.model.KubernetesResource; diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/CreateOrReplaceable.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/CreateOrReplaceable.java index 9748ab82998..13be59490c8 100644 --- a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/CreateOrReplaceable.java +++ b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/CreateOrReplaceable.java @@ -25,7 +25,7 @@ public interface CreateOrReplaceable extends Replaceable { * * @deprecated please use {@link ServerSideApplicable#serverSideApply()} or attempt a create then edit/patch operation. * @see Migration FAQ */ @Deprecated diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/Replaceable.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/Replaceable.java index a329db3ba6d..0e327a28f7a 100644 --- a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/Replaceable.java +++ b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/Replaceable.java @@ -34,7 +34,7 @@ public interface Replaceable { * @deprecated use {@link #update()} instead * * @see Migration FAQ */ @Deprecated @@ -48,7 +48,7 @@ public interface Replaceable { * @deprecated use {@link #updateStatus()} instead * * @see Migration FAQ */ @Deprecated diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/informers/cache/Indexer.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/informers/cache/Indexer.java index d6576943069..0c5f451d53a 100644 --- a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/informers/cache/Indexer.java +++ b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/informers/cache/Indexer.java @@ -23,7 +23,7 @@ * Indexer extends Store interface and add index/de-index methods. * * This implementation has been taken from official client: - * https://github.com/kubernetes-client/java/blob/master/util/src/main/java/io/kubernetes/client/informer/cache/Indexer.java + * https://github.com/kubernetes-client/java/blob/main/util/src/main/java/io/kubernetes/client/informer/cache/Indexer.java * which has been ported from official go client: https://github.com/kubernetes/client-go/blob/master/tools/cache/index.go * * @param resource diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/SharedInformerFactoryImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/SharedInformerFactoryImpl.java index 49cdbe8eb43..98e484b01bf 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/SharedInformerFactoryImpl.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/SharedInformerFactoryImpl.java @@ -39,7 +39,7 @@ * SharedInformerFactory class constructs and caches informers for api types. * * This has been taken from - * https://github.com/kubernetes-client/java/blob/master/util/src/main/java/io/kubernetes/client/informer/SharedInformerFactory.java + * https://github.com/kubernetes-client/java/blob/main/util/src/main/java/io/kubernetes/client/informer/SharedInformerFactory.java * which is ported from official go client https://github.com/kubernetes/client-go/blob/master/informers/factory.go */ public class SharedInformerFactoryImpl implements SharedInformerFactory { diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorListener.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorListener.java index fc8725dd37a..c92b857a652 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorListener.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/ProcessorListener.java @@ -25,7 +25,7 @@ * and actually executes its event handler on notification. * * This has been taken from official client: - * https://github.com/kubernetes-client/java/blob/master/util/src/main/java/io/kubernetes/client/informer/cache/ProcessorListener.java + * https://github.com/kubernetes-client/java/blob/main/util/src/main/java/io/kubernetes/client/informer/cache/ProcessorListener.java * which has been ported from official go client: * https://github.com/kubernetes/client-go/blob/master/tools/cache/shared_informer.go#L570 * diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/SharedProcessor.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/SharedProcessor.java index 9b8828adb65..1805ed0f66e 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/SharedProcessor.java +++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/impl/cache/SharedProcessor.java @@ -36,7 +36,7 @@ * notifications. * * This has been taken from official-client: - * https://github.com/kubernetes-client/java/blob/master/util/src/main/java/io/kubernetes/client/informer/cache/SharedProcessor.java + * https://github.com/kubernetes-client/java/blob/main/util/src/main/java/io/kubernetes/client/informer/cache/SharedProcessor.java * *
* Modified to simplify threading