Skip to content

Commit aeca5f8

Browse files
authored
Merge pull request #3 from projectsyn/cleanup-template
Remove unnecessary template content
2 parents a8c4d15 + 5780fac commit aeca5f8

File tree

21 files changed

+38
-492
lines changed

21 files changed

+38
-492
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
blank_issues_enabled: false
22

3-
# TODO: Redirect support questions
4-
# contact_links:
5-
# - name: ❓ Question
6-
# url: https://github.com/<org>/<repo>/discussions
7-
# about: Ask or discuss with us, we're happy to help 🙋
3+
contact_links:
4+
- name: ❓ Question
5+
url: https://github.com/projectsyn/k8s-service-ca-controller/discussions
6+
about: Ask or discuss with us, we're happy to help 🙋

.github/workflows/test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ jobs:
3434
- name: Upload code coverage report to Code Climate
3535
uses: paambaati/[email protected]
3636
env:
37-
# TODO: Update Reporter ID after importing in codeclimate.com
38-
CC_TEST_REPORTER_ID: 8297d060a2a57278046db1ec5bb0e831a5e1c4e3624ad3991492157b60fc8433
37+
CC_TEST_REPORTER_ID: 048c3d1a32b457559db250ddeffbc87d949df19d1c8e04ee0111f27608d08dae
3938
with:
4039
coverageLocations: cover.out:gocov
4140
prefix: github.com/${{ github.repository }}

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ dist/
33
.github/release-notes.md
44

55
# Build
6-
# TODO: Adjust binary file name
7-
go-bootstrap
6+
k8s-service-ca-controller
87
*.out
98

109
# Docs

.goreleaser.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ snapshot:
2222
name_template: "{{ incpatch .Version }}-snapshot"
2323

2424
dockers:
25-
# TODO: Adjust image locations
2625
- goarch: amd64
2726
use: buildx
2827
build_flag_templates:
@@ -38,8 +37,6 @@ dockers:
3837
- "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}:v{{ .Version }}-arm64"
3938

4039
docker_manifests:
41-
# TODO: Adjust image locations
42-
4340
## ghcr.io
4441
# For prereleases, updating `latest` does not make sense.
4542
# Only the image for the exact version should be pushed.

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ RUN \
77
ca-certificates \
88
tzdata
99

10-
# TODO: Adjust binary file name
11-
ENTRYPOINT ["go-bootstrap"]
12-
COPY go-bootstrap /usr/bin/
10+
ENTRYPOINT ["k8s-service-ca-controller"]
11+
COPY k8s-service-ca-controller /usr/bin/
1312

1413
USER 65536:0

Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,8 @@ MAKEFLAGS += --no-builtin-variables
1010

1111
# General variables
1212
include Makefile.vars.mk
13-
14-
# Following includes do not print warnings or error if files aren't found
15-
# Optional Documentation module.
16-
-include docs/antora-preview.mk docs/antora-build.mk
17-
# Optional kind module
18-
-include kind/kind.mk
13+
include docs/antora-preview.mk
14+
include kind/kind.mk
1915

2016
.PHONY: help
2117
help: ## Show this help

Makefile.vars.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
## These are some common variables for Make
22

33
PROJECT_ROOT_DIR = .
4-
# TODO: Adjust project meta
5-
PROJECT_NAME ?= go-bootstrap
6-
PROJECT_OWNER ?= vshn
4+
PROJECT_NAME ?= k8s-service-ca-controller
5+
PROJECT_OWNER ?= projectsyn
76

87
## BUILD:go
98
BIN_FILENAME ?= $(PROJECT_NAME)

README.md

Lines changed: 12 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,15 @@
1-
# go-bootstrap
1+
# Kubernetes Service CA controller
22

3-
[![Build](https://img.shields.io/github/workflow/status/vshn/go-bootstrap/Test)][build]
4-
![Go version](https://img.shields.io/github/go-mod/go-version/vshn/go-bootstrap)
5-
[![Version](https://img.shields.io/github/v/release/vshn/go-bootstrap)][releases]
6-
[![Maintainability](https://img.shields.io/codeclimate/maintainability/vshn/go-bootstrap)][codeclimate]
7-
[![Coverage](https://img.shields.io/codeclimate/coverage/vshn/go-bootstrap)][codeclimate]
8-
[![GitHub downloads](https://img.shields.io/github/downloads/vshn/go-bootstrap/total)][releases]
3+
[![Build](https://img.shields.io/github/workflow/status/projectsyn/k8s-service-ca-controller/Test)][build]
4+
![Go version](https://img.shields.io/github/go-mod/go-version/projectsyn/k8s-service-ca-controller)
5+
[![Version](https://img.shields.io/github/v/release/projectsyn/k8s-service-ca-controller)][releases]
6+
[![Maintainability](https://img.shields.io/codeclimate/maintainability/projectsyn/k8s-service-ca-controller)][codeclimate]
7+
[![Coverage](https://img.shields.io/codeclimate/coverage/projectsyn/k8s-service-ca-controller)][codeclimate]
8+
[![GitHub downloads](https://img.shields.io/github/downloads/projectsyn/k8s-service-ca-controller/total)][releases]
99

10-
[build]: https://github.com/vshn/go-bootstrap/actions?query=workflow%3ATest
11-
[releases]: https://github.com/vshn/go-bootstrap/releases
12-
[codeclimate]: https://codeclimate.com/github/vshn/go-bootstrap
10+
[build]: https://github.com/projectsyn/k8s-service-ca-controller/actions?query=workflow%3ATest
11+
[releases]: https://github.com/projectsyn/k8s-service-ca-controller/releases
12+
[codeclimate]: https://codeclimate.com/github/projectsyn/k8s-service-ca-controller
1313

14-
Template repository for common Go setups
15-
16-
## Features
17-
18-
* GitHub Workflows
19-
- Build (Go & Docker image)
20-
- Test (including CodeClimate)
21-
- Lint (Go)
22-
- Release (Goreleaser & Changelog generator)
23-
24-
* GitHub issue templates
25-
- PR template
26-
- Issue templates using GitHub issue forms
27-
28-
* Goreleaser
29-
- Go build for `amd64`, `armv8`
30-
- Docker build for `latest` and `vx.y.z` tags
31-
- Push Docker image to GitHub's registry `ghcr.io`
32-
33-
* Antora documentation
34-
- Build default documentation with VSHN styling
35-
- Publish to GitHub Pages by default (opt-out)
36-
- Automated with GitHub workflows to build in `master` branch and (pre-)releases.
37-
- Available `make` targets are prefixed with `docs-`
38-
39-
* Local Kubernetes environment
40-
- Setup Kubernetes-In-Docker (kind)
41-
- Prepares a kubeconfig file in `.kind/`
42-
- Optionally install NGINX as ingress controller
43-
- Available `make` targets are prefixed with `kind-`
44-
45-
* CLI and logging framework
46-
- To help get you started with CLI subcommands, flags and environment variables
47-
- If you don't need subcommands, remove `example_command.go` and adjust `cli.App` settings in `main.go`
48-
49-
## TODO's after generating from this template
50-
51-
TIP: You can search for these tasks using `grep -n -r "TODO:" .`
52-
53-
1. `go.mod`: Adjust module name.
54-
1. `.goreleaser.yml`: Adjust Docker image location in `dockers` and `docker_manifests` parameters.
55-
1. `.gitignore`: Adjust binary file name.
56-
1. `Dockerfile`: Adjust binary file name.
57-
1. `Makefile.vars.mk`: Adjust project meta.
58-
1. `.github/ISSUE_TEMPLATE/config.yml` (optional): Enable forwarding questions to GitHub Discussions or other page.
59-
1. `.github/workflows/test.yml`: Update CodeClimate reporter ID (to be found in codeclimate.com Test coverage settings)
60-
1. `docs/antora.yml`: Adjust project meta.
61-
1. `docs/antora-playbook.yml`: Adjust project meta.
62-
1. `docs/modules/pages/index.adoc`: Edit start page.
63-
1. `docs/modules/nav.adoc`: Edit navigation.
64-
1. `main.go`: Adjust variables.
65-
1. Edit this README (including badges links)
66-
1. Start hacking in `example_command.go`.
67-
68-
After completing a task, you can remove the comment in the files.
69-
70-
## Other repository settings
71-
72-
1. GitHub Settings
73-
- "Options > Wiki" (disable)
74-
- "Options > Allow auto-merge" (enable)
75-
- "Options > Automatically delete head branches" (enable)
76-
- "Collaborators & Teams > Add Teams and users to grant maintainer permissions
77-
- "Branches > Branch protection rules":
78-
- Branch name pattern: `master`
79-
- Require status check to pass before merging: `["lint"]` (you may need to push come commits first)
80-
- "Pages > Source": Branch `gh-pages`
81-
82-
1. GitHub Issue labels
83-
- "Issues > Labels > New Label" for the following labels with color suggestions:
84-
- `change` (`#D93F0B`)
85-
- `dependency` (`#ededed`)
86-
- `breaking` (`#FBCA04`)
87-
88-
1. CodeClimate Settings
89-
- "Repo Settings > GitHub > Pull request status updates" (install)
90-
- "Repo Settings > Test coverage > Enforce {Diff,Total} Coverage" (configure to your liking)
91-
92-
## Antora documentation
93-
94-
This template comes with an Antora documentation module to help you create Asciidoctor documentation.
95-
By default, it is automatically published to GitHub Pages in `gh-pages` branch, however it can also be included in external Antora playbooks.
96-
97-
### Setup GitHub Pages
98-
99-
Once you generated a new repository using this template, the initial commit automatically runs a Job that creates the documentation in the `gh-pages` branch.
100-
All you need to do is then to enable Pages in the settings.
101-
102-
The `gh-pages` branch is a parent-less commit that only contains the Antora-generated files.
103-
104-
However, if that's not the case or if you are setting up Antora in an existing repository, here's how you can achieve the same, but make sure to **commit or stash current changes first!**
105-
```bash
106-
current_branch=$(git rev-parse --abbrev-ref HEAD)
107-
initial_commit=$(git rev-list --max-parents=0 HEAD)
108-
git switch --create gh-pages $initial_commit
109-
git rm -r --cached .
110-
git commit -m "Prepare gh-pages branch"
111-
git push --set-upstream origin gh-pages
112-
git switch -f $current_branch
113-
```
114-
115-
And you're done!
116-
GitHub automatically recognizes activity and sets up Pages if there's a `gh-pages` branch.
117-
118-
---
119-
120-
If you want to skip deployment to GitHub Pages you need to delete specific files and references:
121-
`rm -f .github/workflows/docs.yml docs/package*.json docs/antora-playbook.yml docs/antora-build.mk`.
122-
Also don't forget to delete the branch and disable Pages in the repository settings.
123-
124-
---
125-
126-
If you want to remove documentation completely simply run `rm -rf docs .github/workflows/docs.yml`.
14+
The Kubernetes Service CA controller issues certificates for Services labelled with `service.syn.tools/serving-cert-secret-name`.
15+
The controller uses [cert-manager] for the actual certificate issuing and copies the generated certificate secret into the service namespace.

docs/antora-build.mk

Lines changed: 0 additions & 24 deletions
This file was deleted.

docs/antora-playbook.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
site:
2-
# TODO: Adjust project meta
3-
title: Go Bootstrap
4-
start_page: go-bootstrap::index.adoc
5-
url: https://vshn.github.io/go-bootstrap
2+
title: Kubernetes Service CA controller
3+
start_page: k8s-service-ca-controller::index.adoc
4+
url: https://syn.tools/k8s-service-ca-controller
65
content:
76
sources:
87
- url: ../antora
@@ -12,7 +11,7 @@ content:
1211
start_path: docs
1312
ui:
1413
bundle:
15-
url: https://github.com/vshn/antora-ui-default/releases/download/2.0.15/ui-bundle.zip
14+
url: https://github.com/projectsyn/antora-ui-default/releases/download/2.1.0/ui-bundle.zip
1615
snapshot: true
1716
output:
1817
dir: .public/

0 commit comments

Comments
 (0)