Skip to content

Commit

Permalink
Merge branch 'refs/heads/6.13'
Browse files Browse the repository at this point in the history
# Conflicts:
#	chaos-tests/pom.xml
#	crd-generator/api-v2/pom.xml
#	crd-generator/api/pom.xml
#	crd-generator/apt/pom.xml
#	crd-generator/collector/pom.xml
#	crd-generator/maven-plugin/src/it/test-dependencies/custom-resources/pom.xml
#	crd-generator/maven-plugin/src/it/test-dependencies/intermediate-custom-resource-classes/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/model/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-autoscaling/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-machineconfiguration/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 Sep 25, 2024
2 parents 9e9e650 + 6ee190c commit de71818
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
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.3"
- "6.13.4"
- "6.12.1"
- "6.11.0"
- "6.10.0"
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@
* Fix #6138: Removed unused `io:fabric8:kubernetes-model` artifact
* Fix #6156: Removed deprecated extension `io:fabric8:service-catalog`

### 6.13.4 (2024-09-25)

#### Bugs
* Fix #6247: Support for proxy authentication from proxy URL user info
* Fix #6342: UnmatchedFieldTypeModule prevents certain jackson features from working
* Fix #6350: Allowing authenticated http proxy usage with Jetty, vertx, and JDK for https endpoints
* Fix #6354: Prevent deadlock in okhttp AsyncBody.cancel
* Fix #6366: Allow Retry-After header to be considered in retries

### 6.13.3 (2024-08-13)

#### Bugs
Expand Down

0 comments on commit de71818

Please sign in to comment.