Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to htmltest link checker -- and fix issues #594

Merged
merged 2 commits into from
Feb 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion build/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
FROM gcr.io/agones-images/grpc-cxx:1.16.1

RUN apt-get update && \
apt-get install -y wget psmisc rsync make python bash-completion zip nano jq graphviz linkchecker \
apt-get install -y wget psmisc rsync make python bash-completion zip nano jq graphviz \
gettext-base plantuml && \
apt-get clean

Expand Down Expand Up @@ -126,6 +126,13 @@ RUN mkdir /tmp/hugo && \
RUN curl -sL https://deb.nodesource.com/setup_11.x | bash - && \
apt-get install -y nodejs

# html checker
RUN mkdir /tmp/htmltest && \
wget -O /tmp/htmltest/htmltest.tar.gz https://github.com/wjdp/htmltest/releases/download/v0.10.1/htmltest_0.10.1_linux_amd64.tar.gz && \
tar -zxvf /tmp/htmltest/htmltest.tar.gz -C /tmp/htmltest && \
mv /tmp/htmltest/htmltest /usr/local/bin && \
rm -r /tmp/htmltest

# make sure we keep the path to go
RUN echo "export PATH=/usr/local/go/bin:/go/bin/:\$PATH" >> /root/.bashrc
# make nano the editor
Expand Down
16 changes: 6 additions & 10 deletions build/includes/website.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

# generate the latest website
site-server: ARGS ?=-F
site-server: ENV ?= RELEASE_VERSION="$(base_version)"
site-server: ENV ?= RELEASE_VERSION="$(base_version)" RELEASE_BRANCH=master
site-server: ensure-build-image
docker run --rm $(common_mounts) --workdir=$(mount_path)/site $(DOCKER_RUN_ARGS) -p 1313:1313 $(build_tag) bash -c \
"$(ENV) hugo server --watch --baseURL=http://localhost:1313/ --bind=0.0.0.0 $(ARGS)"
Expand All @@ -52,17 +52,13 @@ site-deploy: site-gen-app-yaml site-static
gcloud app deploy .app.yaml --no-promote --version=$(shell git rev-parse --short=7 HEAD)

site-static-preview:
$(MAKE) site-static ARGS="-F" ENV=RELEASE_VERSION=$(base_version)
$(MAKE) site-static ARGS="-F" ENV="RELEASE_VERSION=$(base_version) RELEASE_BRANCH=master"

site-deploy-preview: site-static-preview
$(MAKE) site-deploy SERVICE=preview

site-test:
docker run --rm --name=agones-website $(common_mounts) --workdir=$(mount_path)/site $(DOCKER_RUN_ARGS) $(build_tag) \
hugo server --watch --baseURL="http://localhost:1313/site/" &
until docker exec agones-website curl -o /dev/null --silent http://localhost:1313/site/; \
do \
echo "Waiting for server to start..."; \
sleep 1; \
done
( trap 'docker stop agones-website' EXIT; docker exec agones-website linkchecker --anchors http://localhost:1313/site/ )
# generate actual html and run test against - provides a more accurate tests
$(MAKE) site-static-preview
docker run --rm -t -e "TERM=xterm-256color" $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) bash -c \
"mkdir -p /tmp/website && cp -r $(mount_path)/site/public /tmp/website/site && htmltest -c $(mount_path)/site/htmltest.yaml /tmp/website"
1 change: 1 addition & 0 deletions docs/governance/templates/release_issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ and copy it into a release issue. Fill in relevent values, found inside {}
- [ ] Create a *draft* release with the [release template][release-template]
- [ ] Make a `tag` with the release version.
- [ ] Site updated
- [ ] Review all `link_test` and `data-proofer-ignore` attributes and remove for link testing
- [ ] If full release, review and remove all instances of the `feature` shortcode
- [ ] If full release, update to the new release branch {version}+0.1.
- [ ] If full release, update site with the new release version (`release-version` in config.toml) to {version}+0.1
Expand Down
1 change: 1 addition & 0 deletions site/content/en/docs/Contribute/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ with the Docsy theme for open source documentation.

- [Hugo Documentation](https://gohugo.io/documentation/)
- [Docsy Guide](https://github.com/google/docsy)
- [Link Checker](https://github.com/wjdp/htmltest)

## Documentation for upcoming features

Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/Examples/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ weight: 120

- {{< ghlink href="examples/simple-udp" >}}Simple UDP{{< /ghlink >}} (Go) - simple server and client that send UDP packets back and forth.
- {{< ghlink href="examples/cpp-simple" >}}CPP Simple{{< /ghlink >}} (C++) - C++ example that starts up, stays healthy and then shuts down after 60 seconds.
- {{< ghlink href="examples/xonotic" >}}Xonotic{{< /ghlink >}} - Wraps the SDK around the open source FPS game {{< ghlink href="http://www.xonotic.org" >}}Xonotic{{< /ghlink >}} and hosts it on Agones.
- {{< ghlink href="examples/xonotic" >}}Xonotic{{< /ghlink >}} - Wraps the SDK around the open source FPS game [Xonotic](http://www.xonotic.org) and hosts it on Agones.
2 changes: 1 addition & 1 deletion site/content/en/docs/Getting Started/create-fleet.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ simple-udp-llg4x-rx6rc Ready 192.168.122.205 7752 minikube 9m
simple-udp-llg4x-v6g2r Ready 192.168.122.205 7623 minikube 9m
```

For the full details of the YAML file head to the [Fleet Specification Guide]({{< ref "/docs/Reference/fleet.md#fleet-specification" >}})
For the full details of the YAML file head to the [Fleet Specification Guide]({{< ref "/docs/Reference/fleet.md" >}})

### 2. Fetch the Fleet status

Expand Down
6 changes: 3 additions & 3 deletions site/content/en/docs/Guides/Client SDKs/cpp.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ grpc::Status status = sdk->Shutdown();
if (!status.ok()) { ... }
```

To [set a Label]({{< relref "_index.md#setlabelkey-value" >}}) on the backing `GameServer` call
To [set a Label]({{< relref "_index.md#setlabel-key-value" >}}) on the backing `GameServer` call
`sdk->SetLabel(key, value)`.

This will return a grpc::Status object, from which we can call `status.ok()` to determine
Expand All @@ -78,7 +78,7 @@ grpc::Status status = sdk->SetLabel("test-label", "test-value");
if (!status.ok()) { ... }
```

To [set an Annotation]({{< relref "_index.md#setannotationkey-value" >}}) on the backing `GameServer` call
To [set an Annotation]({{< relref "_index.md#setannotation-key-value" >}}) on the backing `GameServer` call
`sdk->SetAnnotation(key, value)`.

This will return a grpc::Status object, from which we can call `status.ok()` to determine
Expand All @@ -104,7 +104,7 @@ grpc::Status status = sdk->GameServer(&gameserver);
if (!status.ok()) {...}
```

To get [updates on the backing `GameServer`]({{< relref "_index.md#watchgameserverfunctiongameserver" >}}) as they happen,
To get [updates on the backing `GameServer`]({{< relref "_index.md#watchgameserver-function-gameserver" >}}) as they happen,
call `sdk->WatchGameServer([](stable::agones::dev::sdk::GameServer gameserver){...})`.

This will call the passed in `std::function`
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/Guides/Client SDKs/rest.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ $ curl -d "{}" -H "Content-Type: application/json" -X POST http://localhost:5935

Apply a Label with the prefix "stable.agones.dev/sdk-" to the backing `GameServer` metadata.

See the SDK [SetLabel]({{< ref "/docs/Guides/Client SDKs/_index.md#setlabelkey-value" >}}) documentation for restrictions.
See the SDK [SetLabel]({{< ref "/docs/Guides/Client SDKs/_index.md#setlabel-key-value" >}}) documentation for restrictions.

#### Example

Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/Guides/gameserver-lifecycle.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description: >
when being started and match made.
---

![Lifecyle Sequence Diagram](../../../../diagrams/gameserver-lifecycle.puml.png)
![Lifecyle Sequence Diagram](../../../diagrams/gameserver-lifecycle.puml.png)

## Next Steps:

Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/Guides/metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ Finally to access dashboards run
kubectl port-forward deployments/grafana 3000 -n metrics
```

Open a web browser to [http://127.0.0.1:3000](http://127.0.0.1:3000), you should see Agones [dashboards](#grafana-dashboards) after login as admin.
Open a web browser to [http://localhost:3000](http://localhost:3000), you should see Agones [dashboards](#grafana-dashboards) after login as admin.

> Makefile targets `make grafana-portforward`,`make kind-grafana-portforward` and `make minikube-grafana-portforward`.

Expand Down
13 changes: 7 additions & 6 deletions site/content/en/docs/Installation/helm.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,25 +157,26 @@ The following tables lists the configurable parameters of the Agones chart and t
| `agones.metrics.stackdriverProjectID` | This overrides the default gcp project id for use with stackdriver | `` |
| `agones.registerWebhooks` | Registers the webhooks used for the admission controller | `true` |
| `agones.registerServiceAccounts` | Attempts to create service accounts for the controllers | `true` |
| `agones.controller.nodeSelector` | Controller [node labels](nodeSelector) for pod assignment | `{}` |
| `agones.controller.nodeSelector` | Controller [node labels][nodeSelector] for pod assignment | `{}` |
| `agones.controller.tolerations` | Controller [toleration][toleration] labels for pod assignment | `[]` |
| `agones.controller.affinity` | Controller [affinity](affinity) settings for pod assignment | `{}` |
| `agones.controller.affinity` | Controller [affinity][affinity] settings for pod assignment | `{}` |
| `agones.ping.resources` | Ping pods resource requests/limit | `{}` |
| `agones.ping.nodeSelector` | Ping [node labels](nodeSelector) for pod assignment | `{}` |
| `agones.ping.nodeSelector` | Ping [node labels][nodeSelector] for pod assignment | `{}` |
| `agones.ping.tolerations` | Ping [toleration][toleration] labels for pod assignment | `[]` |
| `agones.ping.affinity` | Ping [affinity](affinity) settings for pod assignment | `{}` |
| `agones.ping.affinity` | Ping [affinity][affinity] settings for pod assignment | `{}` |
| `agones.controller.numWorkers` | Number of workers to spin per resource type | `64` |
| `agones.controller.apiServerQPS` | Maximum sustained queries per second that controller should be making against API Server | `100` |
| `agones.controller.apiServerQPSBurst` | Maximum burst queries per second that controller should be making against API Server | `200` |

[toleration]: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
[nodeSelector]: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
[affinity]: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity

{{% /feature %}}

[constraints]: https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/cpu-constraint-namespace/
[ping]: {{< ref "/docs/Guides/ping-service.md" >}}
[service]: https://kubernetes.io/docs/concepts/services-networking/service/
[nodeSelector]: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
[affinity]: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity

Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/Reference/fleet.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ $ kubectl scale fleet simple-udp --replicas=10
fleet.stable.agones.dev/simple-udp scaled
```

You can also use [Kubernetes API](../Guides/access-api.md) to get or update the Replicas count:
You can also use [Kubernetes API]({{< ref "/docs/Guides/access-api.md" >}}) to get or update the Replicas count:
```
curl http://localhost:8001/apis/stable.agones.dev/v1alpha1/namespaces/default/fleets/simple-udp/scale
...
Expand Down
20 changes: 20 additions & 0 deletions site/htmltest.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright 2019 Google Inc. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

TestFilesConcurrently: false
IgnoreInternalEmptyHash: true
OutputDir: /go/src/agones.dev/agones/site
OutputLogFile: .htmltest.log
IgnoreURLs:
- http://localhost
1 change: 1 addition & 0 deletions site/layouts/partials/page-meta-lastmod.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ T "post_last_mod"}} {{ .Lastmod.Format .Site.Params.time_format_default }}{{ with .GitInfo }}: <a data-proofer-ignore href="{{ $.Site.Params.github_repo }}/commit/{{ .Hash }}">{{ .Subject }} ({{ .AbbreviatedHash }})</a>{{end }}
11 changes: 11 additions & 0 deletions site/layouts/partials/page-meta-links.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{{ if .Path }}
{{ $gh_repo := ($.Param "github_repo") }}
{{ if $gh_repo }}
<div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
{{ $editURL := printf "%s/edit/master/site/content/%s/%s" $gh_repo ($.Site.Language.Lang) .Path }}
{{ $issuesURL := printf "%s/issues/new?title=%s" $gh_repo (htmlEscape $.Title )}}
<a href="{{ $editURL }}" target="_blank"><i class="fa fa-edit fa-fw"></i> {{ T "post_edit_this" }}</a>
<a href="{{ $issuesURL }}" target="_blank"><i class="fab fa-github fa-fw"></i> {{ T "post_create_issue" }}</a>
</div>
{{ end }}
{{ end }}
7 changes: 7 additions & 0 deletions site/layouts/partials/pager.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<ul class="list-unstyled d-flex justify-content-between align-items-center mb-0 pt-5">
<li>
<a {{if .PrevInSection}}href="{{.PrevInSection.RelPermalink}}"{{end}} class="btn btn-primary {{if not .PrevInSection}} disabled{{end}}"><span class="mr-1">←</span> {{ T "ui_pager_prev" }}</a>
</li>
<a {{if .NextInSection}}href="{{.NextInSection.RelPermalink}}"{{end}} class="btn btn-primary {{if not .NextInSection}} disabled{{end}}">{{ T "ui_pager_next" }} <span class="ml-1">→</span></a>
</li>
</ul>
5 changes: 3 additions & 2 deletions site/layouts/shortcodes/ghlink.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
{{- $branch := .Get "branch" | default $.Page.Site.Params.release_branch }}
<a href="{{$.Page.Site.Params.github_repo}}/blob/{{ $branch }}/{{.Get "href"}}" target="_blank">{{.Inner}}</a>
{{- $branch := .Get "branch" | default (getenv "RELEASE_BRANCH") | default $.Page.Site.Params.release_branch }}
{{- $test := eq (.Get "link_test") "true" | default true }}
<a href="{{$.Page.Site.Params.github_repo}}/blob/{{ $branch }}/{{.Get "href"}}" target="_blank" {{if not $test}}data-proofer-ignore{{end}}>{{.Inner}}</a>
3 changes: 2 additions & 1 deletion site/layouts/shortcodes/release-branch.html
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
{{ $.Page.Site.Params.release_branch }}
{{- $branch := getenv "RELEASE_BRANCH" | default $.Page.Site.Params.release_branch }}
{{- $branch }}
5 changes: 0 additions & 5 deletions site/static/favicons/_head.html

This file was deleted.

1 change: 0 additions & 1 deletion site/themes/docsy/layouts/partials/pager.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<li>
<a href="{{if .PrevInSection}}{{.PrevInSection.RelPermalink}}{{end}}" class="btn btn-primary {{if not .PrevInSection}} disabled{{end}}"><span class="mr-1">←</span> {{ T "ui_pager_prev" }}</a>
</li>

<a href="{{if .NextInSection}}{{.NextInSection.RelPermalink}}{{end}}" class="btn btn-primary {{if not .NextInSection}} disabled{{end}}">{{ T "ui_pager_next" }} <span class="ml-1">→</span></a>
</li>
</ul>
Expand Down