Skip to content

Commit

Permalink
Merge pull request #36 from JarvusInnovations/develop
Browse files Browse the repository at this point in the history
Release: v1.1.0
  • Loading branch information
themightychris authored Jun 29, 2023
2 parents 06f6643 + 7c598c7 commit a8e9f14
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish docs to gh-pages

on:
push:
branches: [ main ]
branches: [ develop ]

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/publish-tag-projections.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ jobs:
with:
holobranch: k8s-blueprint-lke
commit-to: k8s/blueprint/lke
commit-to: k8s/blueprint/aks

- name: 'Update holobranch: k8s/blueprint/doks'
uses: JarvusInnovations/hologit@actions/projector/v1
with:
holobranch: k8s-blueprint-doks
commit-to: k8s/blueprint/doks

- name: 'Update holobranch: k8s/manifests/common'
uses: JarvusInnovations/hologit@actions/projector/v1
Expand All @@ -49,3 +56,10 @@ jobs:
with:
holobranch: k8s-manifests-lke
commit-to: k8s/manifests/lke
commit-to: k8s/manifests/aks

- name: 'Update holobranch: k8s/manifests/doks'
uses: JarvusInnovations/hologit@actions/projector/v1
with:
holobranch: k8s-manifests-doks
commit-to: k8s/manifests/doks
4 changes: 4 additions & 0 deletions .holo/branches/k8s-blueprint-doks/_common.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[holomapping]
before = "*"
holosource = "jarvus-cluster-template=>k8s-blueprint"
files = "**"
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[holomapping]
root = "k8s-doks"
files = "**"
3 changes: 3 additions & 0 deletions .holo/branches/k8s-blueprint-doks/metrics-server.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[holomapping]
root = "manifests"
files = "**"
3 changes: 3 additions & 0 deletions .holo/branches/k8s-manifests-doks.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[holobranch]
extend = "k8s-blueprint-doks"
lens = true
11 changes: 11 additions & 0 deletions docs/operations/upgrades/to-1.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To 1.0.x

If upgrading from a version earlier than v0.20.x, follow the notes for upgrading [to v0.20.x](./to-0.20.md) instead.

## Deployment

Before deploying an upgrade to v1.0.x, delete existing `ingress-nginx` jobs to prevent errors about immutable fields being changed:

```bash
kubectl -n ingress-nginx delete jobs ingress-nginx-admission-create ingress-nginx-admission-patch
```
12 changes: 12 additions & 0 deletions k8s-doks/.holo/lenses/metrics-server.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[hololens]
package = "holo/lens-kustomize/1.0"

[hololens.kustomize]
directory = "release"

[hololens.input]
root = "metrics-server"
files = "**"

[hololens.output]
merge = "replace"

0 comments on commit a8e9f14

Please sign in to comment.