Skip to content

Commit a0c0133

Browse files
authored
fix(bootstrap): v9.37.0 (#193)
1 parent 7229dd5 commit a0c0133

File tree

6 files changed

+49
-23
lines changed

6 files changed

+49
-23
lines changed

.circleci/config.yml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 2.1
22
orbs:
3-
shared: getoutreach/shared@1.60.0
3+
shared: getoutreach/shared@1.64.3
44

55
# DEPRECATED: Use the devbase orb instead:
66
# https://github.com/getoutreach/devbase/tree/main/orbs/shared
@@ -64,6 +64,25 @@ jobs:
6464
name: Finish Coveralls upload
6565
command: ./scripts/shell-wrapper.sh ci/testing/coveralls-finish.sh
6666

67+
e2e:
68+
executor:
69+
name: shared/testbed-machine
70+
environment:
71+
VAULT_ADDR: https://vault-dev.outreach.cloud
72+
resource_class: large
73+
steps:
74+
- shared/setup_environment:
75+
machine: true
76+
- shared/with_go_cache
77+
- run:
78+
name: Run E2E Tests
79+
command: KUBECONFIG="$HOME/.outreach/kubeconfig.yaml" make e2e | tee ${TEST_RESULTS}/go-test.out
80+
- run:
81+
name: Upload Code Coverage
82+
command: ./scripts/shell-wrapper.sh ci/testing/coveralls.sh e2e
83+
- shared/save_go_cache # We save at the end because binaries are included with this
84+
- shared/upload_test_results # Uploads to CircleCI
85+
6786
release-dryrun:
6887
executor:
6988
name: shared/testbed-docker
@@ -153,9 +172,16 @@ workflows:
153172
ignore: /.*/
154173
tags:
155174
only: /v[0-9]+(\.[0-9]+)*(-.*)*/
175+
- e2e:
176+
context:
177+
- docker-registry
178+
- ghaccesstoken
179+
- vault-dev
180+
- aws-credentials
156181
- finalize-coverage:
157182
context:
158183
- docker-registry
159184
- ghaccesstoken
160185
requires:
186+
- e2e
161187
- test

bootstrap.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ require (
2929
require github.com/getoutreach/gobox v1.38.0
3030

3131
require (
32-
cloud.google.com/go v0.81.0 // indirect
3332
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
3433
github.com/Azure/go-autorest/autorest v0.11.12 // indirect
3534
github.com/Azure/go-autorest/autorest/adal v0.9.5 // indirect
@@ -41,7 +40,6 @@ require (
4140
github.com/aymerick/douceur v0.2.0 // indirect
4241
github.com/beorn7/perks v1.0.1 // indirect
4342
github.com/blang/semver/v4 v4.0.0 // indirect
44-
github.com/bombsimon/logrusr/v2 v2.0.1
4543
github.com/briandowns/spinner v1.18.1 // indirect
4644
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4745
github.com/charmbracelet/glamour v0.5.0 // indirect
@@ -52,24 +50,19 @@ require (
5250
github.com/facebookgo/limitgroup v0.0.0-20150612190941-6abd8d71ec01 // indirect
5351
github.com/facebookgo/muster v0.0.0-20150708232844-fd3d7953fd52 // indirect
5452
github.com/fatih/color v1.13.0 // indirect
55-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
5653
github.com/go-logr/logr v1.2.3 // indirect
5754
github.com/gogo/protobuf v1.3.2 // indirect
58-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5955
github.com/golang/protobuf v1.5.2 // indirect
6056
github.com/google/go-github/v43 v43.0.0 // indirect
6157
github.com/google/go-querystring v1.1.0 // indirect
62-
github.com/googleapis/gnostic v0.5.5 // indirect
6358
github.com/gorilla/css v1.0.0 // indirect
64-
github.com/hashicorp/golang-lru v0.5.4 // indirect
6559
github.com/honeycombio/beeline-go v1.4.1 // indirect
6660
github.com/honeycombio/libhoney-go v1.15.8 // indirect
6761
github.com/imdario/mergo v0.3.12 // indirect
6862
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
6963
github.com/jmoiron/sqlx v1.3.4 // indirect
7064
github.com/json-iterator/go v1.1.12 // indirect
7165
github.com/klauspost/compress v1.15.1 // indirect
72-
github.com/lib/pq v1.10.2 // indirect
7366
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
7467
github.com/manifoldco/promptui v0.9.0 // indirect
7568
github.com/mattn/go-colorable v0.1.12 // indirect
@@ -105,13 +98,23 @@ require (
10598
golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12 // indirect
10699
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
107100
golang.org/x/text v0.3.7 // indirect
108-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
109101
google.golang.org/appengine v1.6.7 // indirect
110102
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
111103
gopkg.in/inf.v0 v0.9.1 // indirect
112104
gopkg.in/yaml.v2 v2.4.0 // indirect
113105
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
114106
inet.af/netaddr v0.0.0-20210511181906-37180328850c // indirect
107+
)
108+
109+
require (
110+
cloud.google.com/go v0.81.0 // indirect
111+
github.com/bombsimon/logrusr/v2 v2.0.1
112+
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
113+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
114+
github.com/googleapis/gnostic v0.5.5 // indirect
115+
github.com/hashicorp/golang-lru v0.5.4 // indirect
116+
github.com/lib/pq v1.10.2 // indirect
117+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
115118
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
116119
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
117120
sigs.k8s.io/yaml v1.3.0 // indirect

opslevel.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ service:
1212
owner: fnd_dtss
1313
language: Golang
1414
framework: stencil
15-
description: A no-frills local development approach for Kubernetes powered Developer Environments.
15+
description: >
16+
A no-frills local development approach for Kubernetes powered Developer Environments.
1617
###Block(extraServiceMetadata)
17-
1818
###EndBlock(extraServiceMetadata)
1919
aliases:
2020
###Block(extraAliases)
@@ -34,7 +34,7 @@ service:
3434
- key: name
3535
value: "localizer"
3636
- key: stencil_version
37-
value: "v1.14.1"
37+
value: "v1.15.0"
3838
- key: golang_version
3939
value: "1.17.9"
4040
- key: tutorial

service.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,8 @@ arguments:
4242
- deploy/flagship-shared-secret/%(environment)s/authn-flagship-payload
4343
modules:
4444
- name: github.com/getoutreach/stencil-base
45-
version: v0.3.0-rc.2
4645
- name: github.com/getoutreach/stencil-golang
47-
version: v0.3.0-rc.4
4846
- name: github.com/getoutreach/stencil-opslevel
49-
version: v0.0.2-rc.5
5047
opsLevel:
5148
serviceTier: 0
5249
lifecycle: ""

stencil.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
version: v1.14.1
2-
generated: 2022-05-04T19:22:29.761103Z
1+
version: v1.15.0
2+
generated: 2022-05-17T22:26:44.628547Z
33
modules:
44
- name: github.com/getoutreach/stencil-base
55
url: https://github.com/getoutreach/stencil-base
6-
version: v0.3.0-rc.2
6+
version: v0.3.0
77
- name: github.com/getoutreach/stencil-golang
88
url: https://github.com/getoutreach/stencil-golang
9-
version: v0.3.0-rc.4
9+
version: v0.3.2
1010
- name: github.com/getoutreach/stencil-opslevel
1111
url: https://github.com/getoutreach/stencil-opslevel
12-
version: v0.0.2-rc.5
12+
version: v0.0.2
1313
- name: github.com/getoutreach/stencil-discovery
1414
url: https://github.com/getoutreach/stencil-discovery
1515
version: v1.0.0

0 commit comments

Comments
 (0)