Skip to content

Commit

Permalink
fix(bootstrap): v9.37.0 (#193)
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredallard authored Jun 3, 2022
1 parent 7229dd5 commit a0c0133
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 23 deletions.
28 changes: 27 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.1
orbs:
shared: getoutreach/shared@1.60.0
shared: getoutreach/shared@1.64.3

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

e2e:
executor:
name: shared/testbed-machine
environment:
VAULT_ADDR: https://vault-dev.outreach.cloud
resource_class: large
steps:
- shared/setup_environment:
machine: true
- shared/with_go_cache
- run:
name: Run E2E Tests
command: KUBECONFIG="$HOME/.outreach/kubeconfig.yaml" make e2e | tee ${TEST_RESULTS}/go-test.out
- run:
name: Upload Code Coverage
command: ./scripts/shell-wrapper.sh ci/testing/coveralls.sh e2e
- shared/save_go_cache # We save at the end because binaries are included with this
- shared/upload_test_results # Uploads to CircleCI

release-dryrun:
executor:
name: shared/testbed-docker
Expand Down Expand Up @@ -153,9 +172,16 @@ workflows:
ignore: /.*/
tags:
only: /v[0-9]+(\.[0-9]+)*(-.*)*/
- e2e:
context:
- docker-registry
- ghaccesstoken
- vault-dev
- aws-credentials
- finalize-coverage:
context:
- docker-registry
- ghaccesstoken
requires:
- e2e
- test
6 changes: 3 additions & 3 deletions bootstrap.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 11 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ require (
require github.com/getoutreach/gobox v1.38.0

require (
cloud.google.com/go v0.81.0 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.12 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.5 // indirect
Expand All @@ -41,7 +40,6 @@ require (
github.com/aymerick/douceur v0.2.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bombsimon/logrusr/v2 v2.0.1
github.com/briandowns/spinner v1.18.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/charmbracelet/glamour v0.5.0 // indirect
Expand All @@ -52,24 +50,19 @@ require (
github.com/facebookgo/limitgroup v0.0.0-20150612190941-6abd8d71ec01 // indirect
github.com/facebookgo/muster v0.0.0-20150708232844-fd3d7953fd52 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-github/v43 v43.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gorilla/css v1.0.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/honeycombio/beeline-go v1.4.1 // indirect
github.com/honeycombio/libhoney-go v1.15.8 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
github.com/jmoiron/sqlx v1.3.4 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.1 // indirect
github.com/lib/pq v1.10.2 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/manifoldco/promptui v0.9.0 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
Expand Down Expand Up @@ -105,13 +98,23 @@ require (
golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
inet.af/netaddr v0.0.0-20210511181906-37180328850c // indirect
)

require (
cloud.google.com/go v0.81.0 // indirect
github.com/bombsimon/logrusr/v2 v2.0.1
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/lib/pq v1.10.2 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand Down
6 changes: 3 additions & 3 deletions opslevel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ service:
owner: fnd_dtss
language: Golang
framework: stencil
description: A no-frills local development approach for Kubernetes powered Developer Environments.
description: >
A no-frills local development approach for Kubernetes powered Developer Environments.
###Block(extraServiceMetadata)

###EndBlock(extraServiceMetadata)
aliases:
###Block(extraAliases)
Expand All @@ -34,7 +34,7 @@ service:
- key: name
value: "localizer"
- key: stencil_version
value: "v1.14.1"
value: "v1.15.0"
- key: golang_version
value: "1.17.9"
- key: tutorial
Expand Down
3 changes: 0 additions & 3 deletions service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,8 @@ arguments:
- deploy/flagship-shared-secret/%(environment)s/authn-flagship-payload
modules:
- name: github.com/getoutreach/stencil-base
version: v0.3.0-rc.2
- name: github.com/getoutreach/stencil-golang
version: v0.3.0-rc.4
- name: github.com/getoutreach/stencil-opslevel
version: v0.0.2-rc.5
opsLevel:
serviceTier: 0
lifecycle: ""
Expand Down
10 changes: 5 additions & 5 deletions stencil.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
version: v1.14.1
generated: 2022-05-04T19:22:29.761103Z
version: v1.15.0
generated: 2022-05-17T22:26:44.628547Z
modules:
- name: github.com/getoutreach/stencil-base
url: https://github.com/getoutreach/stencil-base
version: v0.3.0-rc.2
version: v0.3.0
- name: github.com/getoutreach/stencil-golang
url: https://github.com/getoutreach/stencil-golang
version: v0.3.0-rc.4
version: v0.3.2
- name: github.com/getoutreach/stencil-opslevel
url: https://github.com/getoutreach/stencil-opslevel
version: v0.0.2-rc.5
version: v0.0.2
- name: github.com/getoutreach/stencil-discovery
url: https://github.com/getoutreach/stencil-discovery
version: v1.0.0
Expand Down

0 comments on commit a0c0133

Please sign in to comment.