Skip to content

Commit

Permalink
Merge branch 'refs/heads/6.13'
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	chaos-tests/pom.xml
#	crd-generator/api-v2/pom.xml
#	crd-generator/api/pom.xml
#	crd-generator/apt/pom.xml
#	crd-generator/pom.xml
#	crd-generator/test-apt/pom.xml
#	crd-generator/test/pom.xml
#	extensions/certmanager/client/pom.xml
#	extensions/certmanager/examples/pom.xml
#	extensions/certmanager/model-v1/pom.xml
#	extensions/certmanager/model-v1alpha2/pom.xml
#	extensions/certmanager/model-v1alpha3/pom.xml
#	extensions/certmanager/model-v1beta1/pom.xml
#	extensions/certmanager/pom.xml
#	extensions/certmanager/tests/pom.xml
#	extensions/chaosmesh/client/pom.xml
#	extensions/chaosmesh/examples/pom.xml
#	extensions/chaosmesh/model/pom.xml
#	extensions/chaosmesh/pom.xml
#	extensions/chaosmesh/tests/pom.xml
#	extensions/istio/client/pom.xml
#	extensions/istio/examples/pom.xml
#	extensions/istio/model-v1alpha3/pom.xml
#	extensions/istio/model-v1beta1/pom.xml
#	extensions/istio/pom.xml
#	extensions/istio/tests/pom.xml
#	extensions/knative/client/pom.xml
#	extensions/knative/examples/pom.xml
#	extensions/knative/model/pom.xml
#	extensions/knative/pom.xml
#	extensions/knative/tests/pom.xml
#	extensions/open-cluster-management/client/pom.xml
#	extensions/open-cluster-management/examples/pom.xml
#	extensions/open-cluster-management/model-agent/pom.xml
#	extensions/open-cluster-management/model-apps/pom.xml
#	extensions/open-cluster-management/model-cluster/pom.xml
#	extensions/open-cluster-management/model-discovery/pom.xml
#	extensions/open-cluster-management/model-observability/pom.xml
#	extensions/open-cluster-management/model-operator/pom.xml
#	extensions/open-cluster-management/model-placementruleapps/pom.xml
#	extensions/open-cluster-management/model-policy/pom.xml
#	extensions/open-cluster-management/model-search/pom.xml
#	extensions/open-cluster-management/pom.xml
#	extensions/open-cluster-management/tests/pom.xml
#	extensions/open-virtual-networking/client/pom.xml
#	extensions/open-virtual-networking/model-v1/pom.xml
#	extensions/open-virtual-networking/pom.xml
#	extensions/open-virtual-networking/tests/pom.xml
#	extensions/pom.xml
#	extensions/service-catalog/client/pom.xml
#	extensions/service-catalog/examples/pom.xml
#	extensions/service-catalog/model/pom.xml
#	extensions/service-catalog/pom.xml
#	extensions/service-catalog/tests/pom.xml
#	extensions/tekton/client/pom.xml
#	extensions/tekton/examples/pom.xml
#	extensions/tekton/model-triggers-v1alpha1/pom.xml
#	extensions/tekton/model-triggers-v1beta1/pom.xml
#	extensions/tekton/model-v1/pom.xml
#	extensions/tekton/model-v1alpha1/pom.xml
#	extensions/tekton/model-v1beta1/pom.xml
#	extensions/tekton/pom.xml
#	extensions/tekton/tests/pom.xml
#	extensions/verticalpodautoscaler/client/pom.xml
#	extensions/verticalpodautoscaler/examples/pom.xml
#	extensions/verticalpodautoscaler/model-v1/pom.xml
#	extensions/verticalpodautoscaler/pom.xml
#	extensions/verticalpodautoscaler/tests/pom.xml
#	extensions/volcano/client/pom.xml
#	extensions/volcano/examples/pom.xml
#	extensions/volcano/model-v1beta1/pom.xml
#	extensions/volcano/pom.xml
#	extensions/volcano/tests/pom.xml
#	extensions/volumesnapshot/client/pom.xml
#	extensions/volumesnapshot/examples/pom.xml
#	extensions/volumesnapshot/model/pom.xml
#	extensions/volumesnapshot/pom.xml
#	extensions/volumesnapshot/tests/pom.xml
#	generator-annotations/pom.xml
#	httpclient-jdk/pom.xml
#	httpclient-jetty/pom.xml
#	httpclient-okhttp/pom.xml
#	httpclient-tests/pom.xml
#	httpclient-vertx/pom.xml
#	java-generator/benchmark/pom.xml
#	java-generator/cli/pom.xml
#	java-generator/core/pom.xml
#	java-generator/gradle-plugin/pom.xml
#	java-generator/it/pom.xml
#	java-generator/maven-plugin/pom.xml
#	java-generator/pom.xml
#	junit/kube-api-test/client-inject/pom.xml
#	junit/kube-api-test/core/pom.xml
#	junit/kube-api-test/pom.xml
#	junit/kubernetes-junit-jupiter-autodetected/pom.xml
#	junit/kubernetes-junit-jupiter/pom.xml
#	junit/kubernetes-server-mock/pom.xml
#	junit/mockwebserver/pom.xml
#	junit/openshift-server-mock/pom.xml
#	kubernetes-client-api/pom.xml
#	kubernetes-client-deps-compatibility-tests/kubernetes-client-init-bc-fips/pom.xml
#	kubernetes-client-deps-compatibility-tests/pom.xml
#	kubernetes-client/pom.xml
#	kubernetes-examples/pom.xml
#	kubernetes-itests/pom.xml
#	kubernetes-model-generator/kubernetes-model-admissionregistration/pom.xml
#	kubernetes-model-generator/kubernetes-model-apiextensions/pom.xml
#	kubernetes-model-generator/kubernetes-model-apps/pom.xml
#	kubernetes-model-generator/kubernetes-model-autoscaling/pom.xml
#	kubernetes-model-generator/kubernetes-model-batch/pom.xml
#	kubernetes-model-generator/kubernetes-model-certificates/pom.xml
#	kubernetes-model-generator/kubernetes-model-common/pom.xml
#	kubernetes-model-generator/kubernetes-model-coordination/pom.xml
#	kubernetes-model-generator/kubernetes-model-core/pom.xml
#	kubernetes-model-generator/kubernetes-model-discovery/pom.xml
#	kubernetes-model-generator/kubernetes-model-events/pom.xml
#	kubernetes-model-generator/kubernetes-model-extensions/pom.xml
#	kubernetes-model-generator/kubernetes-model-flowcontrol/pom.xml
#	kubernetes-model-generator/kubernetes-model-gatewayapi/pom.xml
#	kubernetes-model-generator/kubernetes-model-jsonschema2pojo/pom.xml
#	kubernetes-model-generator/kubernetes-model-kustomize/pom.xml
#	kubernetes-model-generator/kubernetes-model-metrics/pom.xml
#	kubernetes-model-generator/kubernetes-model-networking/pom.xml
#	kubernetes-model-generator/kubernetes-model-node/pom.xml
#	kubernetes-model-generator/kubernetes-model-policy/pom.xml
#	kubernetes-model-generator/kubernetes-model-rbac/pom.xml
#	kubernetes-model-generator/kubernetes-model-resource/pom.xml
#	kubernetes-model-generator/kubernetes-model-scheduling/pom.xml
#	kubernetes-model-generator/kubernetes-model-storageclass/pom.xml
#	kubernetes-model-generator/kubernetes-model/pom.xml
#	kubernetes-model-generator/openshift-model-clusterautoscaling/pom.xml
#	kubernetes-model-generator/openshift-model-config/pom.xml
#	kubernetes-model-generator/openshift-model-console/pom.xml
#	kubernetes-model-generator/openshift-model-hive/pom.xml
#	kubernetes-model-generator/openshift-model-installer/pom.xml
#	kubernetes-model-generator/openshift-model-machine/pom.xml
#	kubernetes-model-generator/openshift-model-machineconfig/pom.xml
#	kubernetes-model-generator/openshift-model-miscellaneous/pom.xml
#	kubernetes-model-generator/openshift-model-monitoring/pom.xml
#	kubernetes-model-generator/openshift-model-operator/pom.xml
#	kubernetes-model-generator/openshift-model-operatorhub/pom.xml
#	kubernetes-model-generator/openshift-model-storageversionmigrator/pom.xml
#	kubernetes-model-generator/openshift-model-tuned/pom.xml
#	kubernetes-model-generator/openshift-model-whereabouts/pom.xml
#	kubernetes-model-generator/openshift-model/pom.xml
#	kubernetes-model-generator/pom.xml
#	kubernetes-tests/pom.xml
#	log4j/pom.xml
#	openshift-client-api/pom.xml
#	openshift-client/pom.xml
#	platforms/karaf/features/pom.xml
#	platforms/karaf/itests/pom.xml
#	platforms/karaf/pom.xml
#	platforms/pom.xml
#	pom.xml
#	uberjar/pom.xml
  • Loading branch information
manusa committed Jul 2, 2024
2 parents ea02994 + 33181b8 commit 409be3b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ body:
description: Fabric8 Kubernetes Client version (can be found in pom.xml dependency or build.gradle implementation section)
options:
- "SNAPSHOT"
- "6.13.0"
- "6.13.1"
- "6.12.1"
- "6.11.0"
- "6.10.0"
Expand Down
10 changes: 7 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@

#### Bugs
* Fix #6038: Support for Gradle configuration cache
* Fix #6059: Swallow rejected execution from internal usage of the informer executor
* Fix #6068: KubernetesMockServer provides incomplete Configuration while creating test Config for KubernetesClient
* Fix #6085: model getters have same annotations as fields (breaks native)

#### Improvements
* Fix #6008: removing the optional dependency on bouncy castle
Expand All @@ -21,6 +18,13 @@
* Check detailed migration documentation for breaking changes in [7.0.0](./doc/MIGRATION-v7.md)
* `Config.errorMessages` has been removed. Please use Kubernetes status messages directly.

### 6.13.1 (2024-07-02)

#### Bugs
* Fix #6059: Swallow rejected execution from internal usage of the informer executor
* Fix #6068: KubernetesMockServer provides incomplete Configuration while creating test Config for KubernetesClient
* Fix #6085: model getters have same annotations as fields (breaks native)

### 6.13.0 (2024-05-29)

#### Bugs
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
</osgi.include.resources.default>
<osgi.include.resources>${osgi.include.resources.default}</osgi.include.resources>
<karaf.itest.skip>false</karaf.itest.skip>
<project.build.outputTimestamp>2024-05-29T10:16:36Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2024-07-02T08:01:57Z</project.build.outputTimestamp>
<validation-api.version>2.0.1.Final</validation-api.version>

<jsonschema2pojo.targetPackage>io.fabric8.kubernetes.api.model</jsonschema2pojo.targetPackage>
Expand Down

0 comments on commit 409be3b

Please sign in to comment.