Skip to content

Commit

Permalink
Merge pull request #85709 from tanjunchen/correct-404-ruls
Browse files Browse the repository at this point in the history
correct  invalid  urls
  • Loading branch information
k8s-ci-robot committed Dec 6, 2019
2 parents 27fac0b + efd61ae commit 117a3a7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG-1.6.md
Expand Up @@ -756,14 +756,14 @@ filename | sha256 hash

## Known Issues for v1.6.5

* If you use the [GLBC Ingress Controller](https://github.com/kubernetes/ingress/tree/master/controllers/gce),
* If you use the [GLBC Ingress Controller](https://github.com/kubernetes/ingress-nginx/tree/0.9.0-beta.1/controllers/gce),
upgrading an existing pre-v1.6.4 cluster to Kubernetes v1.6.5 will cause an unintentional
[overwrite of manual edits to GCP Health Checks](https://github.com/kubernetes/ingress/issues/842)
managed by the GLBC Ingress Controller. This can cause the health checks to start failing,
requiring you to reapply the manual edits.
* This issue does not affect clusters that were already running Kubernetes v1.6.4 or higher.
* This issue does not affect Health Checks that were left in the configuration
[originally set by the GLBC Ingress Controller](https://github.com/kubernetes/ingress/tree/master/controllers/gce#health-checks).
[originally set by the GLBC Ingress Controller](https://github.com/kubernetes/ingress-nginx/tree/0.9.0-beta.1/controllers/gce#health-checks).

## Downloads for v1.6.5

Expand Down Expand Up @@ -852,14 +852,14 @@ filename | sha256 hash

## Known Issues for v1.6.4

* If you use the [GLBC Ingress Controller](https://github.com/kubernetes/ingress/tree/master/controllers/gce),
* If you use the [GLBC Ingress Controller](https://github.com/kubernetes/ingress-nginx/tree/0.9.0-beta.1/controllers/gce),
upgrading an existing cluster to Kubernetes v1.6.4 will cause an unintentional
[overwrite of manual edits to GCP Health Checks](https://github.com/kubernetes/ingress/issues/842)
managed by the GLBC Ingress Controller. This can cause the health checks to start failing,
requiring you to reapply the manual edits.
* This issue does not affect clusters that start out with Kubernetes v1.6.4 or higher.
* This issue does not affect Health Checks that were left in the configuration
[originally set by the GLBC Ingress Controller](https://github.com/kubernetes/ingress/tree/master/controllers/gce#health-checks).
[originally set by the GLBC Ingress Controller](https://github.com/kubernetes/ingress-nginx/tree/0.9.0-beta.1/controllers/gce#health-checks).

## Downloads for v1.6.4

Expand Down
4 changes: 1 addition & 3 deletions cluster/addons/fluentd-elasticsearch/README.md
Expand Up @@ -26,8 +26,7 @@ you need these features, please consider building the images from either the
"basic" or "platinum" version. After enabling these features, follow [official
documentation][setupCreds] to set up credentials in Elasticsearch and Kibana.
Don't forget to propagate those credentials also to Fluentd in its
[configuration][fluentdCreds], using for example [environment
variables][fluentdEnvVar]. You can utilize [ConfigMaps][configMap] and
[configuration][fluentdCreds]. You can utilize [ConfigMaps][configMap] and
[Secrets][secret] to store credentials in the Kubernetes apiserver.

### Initialization
Expand Down Expand Up @@ -72,7 +71,6 @@ avoid Fluentd pods scheduling there.
[xPack]: https://www.elastic.co/products/x-pack
[setupCreds]: https://www.elastic.co/guide/en/x-pack/current/setting-up-authentication.html#reset-built-in-user-passwords
[fluentdCreds]: https://github.com/uken/fluent-plugin-elasticsearch#user-password-path-scheme-ssl_verify
[fluentdEnvVar]: https://docs.fluentd.org/v0.12/articles/faq#how-can-i-use-environment-variables-to-configure-parameters-dynamically
[configMap]: https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/
[secret]: https://kubernetes.io/docs/concepts/configuration/secret/
[statefulSet]: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset
Expand Down
2 changes: 1 addition & 1 deletion staging/README.md
Expand Up @@ -88,7 +88,7 @@ for an example.

2. Setup branch protection and enable access to the `stage-bots` team
by adding the repo in
[`prow/config.yaml`](https://github.com/kubernetes/test-infra/blob/master/prow/config.yaml).
[`prow/config.yaml`](https://github.com/kubernetes/test-infra/blob/master/config/prow/config.yaml).
See [#kubernetes/test-infra#9292](https://github.com/kubernetes/test-infra/pull/9292)
for an example.

Expand Down
Expand Up @@ -17,7 +17,7 @@ values that should be copied from this file or that are recommended.
In practice, fields with no value should simply be omitted from kustomization.yaml
to reduce the content visible in configuration reviews.

Example copied from the [kustomize repo](https://github.com/kubernetes-sigs/kustomize/blob/master/docs/kustomization.yaml)
Example copied from the [kustomize repo](https://github.com/kubernetes-sigs/kustomize/tree/master/examples)

{% sample lang="yaml" %}
```yaml
Expand Down Expand Up @@ -270,7 +270,7 @@ vars:
# specified by kustomize's configuration data.
#
# The default config data for vars is at
# https://github.com/kubernetes-sigs/kustomize/blob/master/pkg/transformers/config/defaultconfig/varreference.go
# https://github.com/kubernetes-sigs/kustomize/blob/v3.3.1/pkg/transformers/config/defaultconfig/varreference.go
# Long story short, the default targets are all
# container command args and env value fields.
#
Expand Down

0 comments on commit 117a3a7

Please sign in to comment.