Skip to content
This repository was archived by the owner on Mar 16, 2024. It is now read-only.

Commit f16907b

Browse files
authored
Merge pull request #1619 from drpebcak/acorn-dns
2 parents 83a8053 + 7915de6 commit f16907b

File tree

37 files changed

+108
-113
lines changed

37 files changed

+108
-113
lines changed

.github/workflows/main-mac-smoke-test.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ concurrency:
77
on:
88
push:
99
branches:
10-
- main
10+
- main
1111

1212
jobs:
1313
release:
@@ -62,13 +62,12 @@ jobs:
6262
AC_P12: ${{ secrets.AC_P12 }}
6363
AC_P12_PASSWORD: ${{ secrets.AC_P12_PASSWORD }}
6464
KEYCHAIN: ${{ steps.keychain.outputs['keychain-name'] }}
65-
ACORN_DNS_ENDPOINT: https://alpha-dns.acrn.io/v1
6665
- name: report failure to slack
6766
if: failure()
6867
id: slack-failure
6968
uses: slackapi/[email protected]
7069
with:
71-
channel-id: '${{ secrets.SLACK_BOT_FAILURE_CHANNEL }}'
70+
channel-id: "${{ secrets.SLACK_BOT_FAILURE_CHANNEL }}"
7271
slack-message: "❌ Main-Mac-Release failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
7372
env:
7473
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/main-release.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ concurrency:
77
on:
88
push:
99
branches:
10-
- main
10+
- main
1111

1212
permissions:
1313
contents: write
@@ -56,7 +56,6 @@ jobs:
5656
env:
5757
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5858
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
59-
ACORN_DNS_ENDPOINT: https://staging-dns.acrn.io/v1
6059
- name: Push Docker Images
6160
run: |
6261
VERSION=v$(cat releases/metadata.json | jq -r .version)
@@ -83,8 +82,7 @@ jobs:
8382
id: slack-failure
8483
uses: slackapi/[email protected]
8584
with:
86-
channel-id: '${{ secrets.SLACK_BOT_FAILURE_CHANNEL }}'
85+
channel-id: "${{ secrets.SLACK_BOT_FAILURE_CHANNEL }}"
8786
slack-message: "❌ Main-Release failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
8887
env:
8988
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
90-

.github/workflows/release.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,21 @@ jobs:
6161
AC_P12: ${{ secrets.AC_P12 }}
6262
AC_P12_PASSWORD: ${{ secrets.AC_P12_PASSWORD }}
6363
KEYCHAIN: ${{ steps.keychain.outputs['keychain-name'] }}
64-
ACORN_DNS_ENDPOINT: https://alpha-dns.acrn.io/v1
6564
GORELEASER_CURRENT_TAG: ${{ github.ref_name }}
6665
- name: report failure to slack
6766
if: failure()
6867
id: slack-failure
6968
uses: slackapi/[email protected]
7069
with:
71-
channel-id: '${{ secrets.SLACK_BOT_FAILURE_CHANNEL }}'
70+
channel-id: "${{ secrets.SLACK_BOT_FAILURE_CHANNEL }}"
7271
slack-message: "❌ Release failed: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
7372
env:
7473
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
7574
- name: report success to slack
7675
id: slack-success
7776
uses: slackapi/[email protected]
7877
with:
79-
channel-id: '${{ secrets.USERS_SLACK_BOT_RELEASE_CHANNEL }}'
78+
channel-id: "${{ secrets.USERS_SLACK_BOT_RELEASE_CHANNEL }}"
8079
slack-message: " ✅ Release ${{ github.ref_name }} is now available: ${{ github.server_url }}/${{ github.repository }}/releases/${{ github.ref_name }}"
8180
env:
82-
SLACK_BOT_TOKEN: '${{ secrets.USERS_SLACK_BOT_TOKEN }}'
81+
SLACK_BOT_TOKEN: "${{ secrets.USERS_SLACK_BOT_TOKEN }}"

.goreleaser.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ builds:
2424
- -s
2525
- -w
2626
- -X "github.com/acorn-io/acorn/pkg/version.Tag=v{{ .Version }}"
27-
- -X "github.com/acorn-io/acorn/pkg/config.AcornDNSEndpointDefault={{ .Env.ACORN_DNS_ENDPOINT }}"
2827

2928
universal_binaries:
3029
- id: mac
@@ -48,7 +47,7 @@ archives:
4847
builds:
4948
- default
5049
- mac
51-
name_template: "{{ .ProjectName }}-v{{ .Version }}-{{ if eq .Os \"darwin\" }}macOS-universal{{ else }}{{ .Os }}-{{ .Arch }}{{ .Arm }}{{ end }}"
50+
name_template: '{{ .ProjectName }}-v{{ .Version }}-{{ if eq .Os "darwin" }}macOS-universal{{ else }}{{ .Os }}-{{ .Arch }}{{ .Arm }}{{ end }}'
5251
format_overrides:
5352
- goos: windows
5453
format: zip
@@ -62,7 +61,8 @@ signs:
6261
- id: cosign
6362
cmd: cosign
6463
stdin: "{{ .Env.COSIGN_PASSWORD }}"
65-
args: ["sign-blob", "--key=cosign.key", "--output=${signature}", "${artifact}"]
64+
args:
65+
["sign-blob", "--key=cosign.key", "--output=${signature}", "${artifact}"]
6666
artifacts: checksum
6767

6868
changelog:

docs/docs/10-home.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ To check the status of our app we can run the following.
122122
```shell
123123
acorn apps green-bush
124124
#NAME IMAGE HEALTHY UPTODATE CREATED ENDPOINTS MESSAGE
125-
#green-bush 60d803258f7aa2680e4910c526485488949835728a2bc3519c09f1b6b3be1bb3 1 1 About a minute ago http://web-nginx-green-bush-6cc6aeba547e.local.on-acorn.io => web:80 OK
125+
#green-bush 60d803258f7aa2680e4910c526485488949835728a2bc3519c09f1b6b3be1bb3 1 1 About a minute ago http://web-nginx-green-bush-6cc6aeba547e.local.oss-acorn.io => web:80 OK
126126
```
127127

128128
In Chrome or Firefox browsers you can now open the URL listed under the endpoints column to see our app.

docs/docs/100-reference/01-command-line/acorn_install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ acorn install
2828
--auto-upgrade-interval string For apps configured with automatic upgrades enabled, the interval at which to check for new versions. Upgrade intervals configured at the application level cannot be smaller than this. (default '5m' - 5 minutes)
2929
--aws-identity-provider-arn string ARN of cluster's OpenID Connect provider registered in AWS
3030
--builder-per-project Create a dedicated builder per project
31-
--cluster-domain strings The externally addressable cluster domain (default .on-acorn.io)
31+
--cluster-domain strings The externally addressable cluster domain (default .oss-acorn.io)
3232
--controller-replicas int acorn-controller deployment replica count
3333
--controller-service-account-annotation strings annotation to apply to the acorn-system service account
3434
-h, --help help for install

docs/docs/30-installation/01-installing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ k3d cluster create --api-port 6550 -p "8081:80@loadbalancer"
183183
then you must reflect that in the `acorn install` command by specifying the port with the `--cluster-domain` flag:
184184

185185
```shell
186-
acorn install --cluster-domain '.local.on-acorn.io:8081'
186+
acorn install --cluster-domain '.local.oss-acorn.io:8081'
187187
```
188188

189189
**Kind** comes with a working storage class by default, but you need to take some extra steps to get ingress and service loadbalancer capabilities:

docs/docs/30-installation/02-options.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $ acorn run -P ghcr.io/acorn-io/library/hello-world
1313

1414
$ acorn ps
1515
NAME IMAGE HEALTHY UP-TO-DATE CREATED ENDPOINTS MESSAGE
16-
black-sea ghcr.io/acorn-io/library/hello-world 1 1 6s ago http://webapp-black-sea-4232beae.qnrzq5.alpha.on-acorn.io => webapp:80 OK
16+
black-sea ghcr.io/acorn-io/library/hello-world 1 1 6s ago http://webapp-black-sea-4232beae.qnrzq5.oss-acorn.io => webapp:80 OK
1717
```
1818
By default, endpoints are `http`. To have acorn automatically generate a [Let's Encrypt](https://letsencrypt.org/) certificate and secure your endpoints, you can enable acorn's Let's Encrypt integration like this:
1919
```bash
@@ -25,7 +25,7 @@ acorn install --lets-encrypt enabled --lets-encrypt-tos-agree=true --lets-encryp
2525
```
2626

2727
:::info
28-
Let's Encrypt integration is only useful if you are running a non-local Kubernetes cluster. If you are running acorn on a local cluster such as Docker Desktop, Rancher Desktop, or minikube, enabling Let's Encrypt will have no effect. We don't issue certificates for the `.local.on-acorn.io` domains that are used in this scenario.
28+
Let's Encrypt integration is only useful if you are running a non-local Kubernetes cluster. If you are running acorn on a local cluster such as Docker Desktop, Rancher Desktop, or minikube, enabling Let's Encrypt will have no effect. We don't issue certificates for the `.local.oss-acorn.io` domains that are used in this scenario.
2929
:::
3030

3131
## Endpoint domain names

docs/docs/37-getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ acorn apps
266266
```bash
267267
$ acorn apps
268268
NAME IMAGE HEALTHY UP-TO-DATE CREATED ENDPOINTS MESSAGE
269-
awesome-acorn 2d73c8a0493f 3 3 121m ago http://app-awesome-acorn-56d50c8c0915.local.on-acorn.io => app:5000 OK
269+
awesome-acorn 2d73c8a0493f 3 3 121m ago http://app-awesome-acorn-56d50c8c0915.local.oss-acorn.io => app:5000 OK
270270
```
271271
272272
You probably already noticed the link right there in the `ENDPOINTS` column. It will take you to your Python Flask App.

0 commit comments

Comments
 (0)