Skip to content

Commit

Permalink
Merge pull request #61 from slr71/main
Browse files Browse the repository at this point in the history
DD-17: added `ephemeral-storage` requests and limits.
  • Loading branch information
slr71 authored Mar 8, 2024
2 parents 116f0e6 + 2d95132 commit 9ce6b60
Show file tree
Hide file tree
Showing 7 changed files with 111 additions and 1,809 deletions.
35 changes: 0 additions & 35 deletions .github/workflows/build-prerelease.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/build-release.yml

This file was deleted.

50 changes: 4 additions & 46 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +6,8 @@ on:
- main
pull_request:

permissions:
contents: read
# Optional: allow read access to pull request. Use with `only-new-issues` option.
# pull-requests: read

jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21'
cache: false
- name: golangci-lint
uses: golangci/golangci-lint-action@v4
with:
# Require: The version of golangci-lint to use.
# When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
# When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
version: v1.54

# Optional: working directory, useful for monorepos
# working-directory: somedir

# Optional: golangci-lint command line arguments.
#
# Note: by default the `.golangci.yml` file should be at the root of the repository.
# The location of the configuration file can be changed by using `--config=`
# args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0

# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true

# Optional: if set to true then the all caching functionality will be complete disabled,
# takes precedence over all other caching options.
# skip-cache: true

# Optional: if set to true then the action don't cache or restore ~/go/pkg.
# skip-pkg-cache: true

# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
# skip-build-cache: true

# Optional:The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
# install-mode: "goinstall"
call-workflow-passing-data:
uses: cyverse-de/github-workflows/.github/workflows/[email protected]
with:
go-version: 1.21
16 changes: 16 additions & 0 deletions .github/workflows/skaffold-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: skaffold-build

on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+"
- "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+"

jobs:
call-workflow-passing-data:
uses: cyverse-de/github-workflows/.github/workflows/[email protected]
with:
build-prerelease: ${{ contains(github.ref_name, '-rc') }}
secrets:
harbor-username: ${{ secrets.HARBOR_USERNAME }}
harbor-password: ${{ secrets.HARBOR_PASSWORD }}
48 changes: 22 additions & 26 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,23 @@ require (
)

require (
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.14.1 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
github.com/jackc/pgtype v1.14.2 // indirect
github.com/jackc/pgx/v4 v4.18.1 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/text v0.14.0 // indirect
)

require (
github.com/cyverse-de/dbutil v1.0.1
github.com/lib/pq v1.10.9
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/sys v0.18.0 // indirect
)

require (
Expand All @@ -43,22 +37,24 @@ require (
github.com/cyverse-de/go-mod/otelutils v0.0.3
github.com/cyverse-de/go-mod/pbinit v0.1.11
github.com/cyverse-de/go-mod/protobufjson v0.0.3
github.com/cyverse-de/p/go/qms v0.1.10
github.com/go-playground/validator/v10 v10.18.0
github.com/cyverse-de/p/go/qms v0.1.13
github.com/go-playground/validator/v10 v10.19.0
github.com/golang-migrate/migrate/v4 v4.17.0
github.com/knadh/koanf v1.5.0
github.com/labstack/echo/v4 v4.11.4
github.com/spirosoik/echo-logrus v1.0.0
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.2.3
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.48.0
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.49.0
)

require (
github.com/cyverse-de/go-mod/gotelnats v0.0.11 // indirect
github.com/cyverse-de/p/go/analysis v0.0.15 // indirect
github.com/cyverse-de/p/go/header v0.0.3 // indirect
github.com/cyverse-de/p/go/monitoring v0.0.4 // indirect
github.com/cyverse-de/p/go/svcerror v0.0.7 // indirect
github.com/cyverse-de/p v0.0.0-20240228001927-426a6bd80191 // indirect
github.com/cyverse-de/p/go/analysis v0.0.16 // indirect
github.com/cyverse-de/p/go/containers v0.0.2 // indirect
github.com/cyverse-de/p/go/header v0.0.4 // indirect
github.com/cyverse-de/p/go/monitoring v0.0.5 // indirect
github.com/cyverse-de/p/go/svcerror v0.0.8 // indirect
github.com/cyverse-de/p/go/user v0.0.11 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/go-logr/logr v1.4.1 // indirect
Expand All @@ -69,28 +65,28 @@ require (
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/jackc/pgx/v5 v5.5.3 // indirect
github.com/jackc/pgx/v5 v5.5.4 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/joho/godotenv v1.5.1 // indirect
github.com/klauspost/compress v1.17.6 // indirect
github.com/klauspost/compress v1.17.7 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/nats-io/nats.go v1.32.0 // indirect
github.com/nats-io/nats.go v1.33.1 // indirect
github.com/nats-io/nkeys v0.4.7 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.3 // indirect
go.opentelemetry.io/otel v1.23.1 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
go.opentelemetry.io/otel/metric v1.23.1 // indirect
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
go.opentelemetry.io/otel/trace v1.23.1 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 9ce6b60

Please sign in to comment.