Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: stefanprodan/podinfo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6.1.6
Choose a base ref
...
head repository: stefanprodan/podinfo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6.1.7
Choose a head ref
  • 11 commits
  • 22 files changed
  • 4 contributors

Commits on Jun 12, 2022

  1. Copy the full SHA
    116a378 View commit details

Commits on Jun 14, 2022

  1. Merge pull request #202 from TaylorMonacelli/patch-1

    Fix test error "Error: release: not found"
    stefanprodan authored Jun 14, 2022
    Copy the full SHA
    4d2cf65 View commit details

Commits on Jun 20, 2022

  1. Add params to godoc for cache

    FlomoN committed Jun 20, 2022
    Copy the full SHA
    8697f09 View commit details
  2. switch to for installing swag

    FlomoN committed Jun 20, 2022
    Copy the full SHA
    2da5998 View commit details
  3. recreate docs

    FlomoN committed Jun 20, 2022
    Copy the full SHA
    678a42c View commit details
  4. Copy the full SHA
    2eb17d8 View commit details

Commits on Jun 22, 2022

  1. Merge pull request #204 from FlomoN/master

    Add path based params to OpenAPI spec
    stefanprodan authored Jun 22, 2022
    Copy the full SHA
    b76b1a3 View commit details

Commits on Jul 27, 2022

  1. Update Swagger packages and definition

    Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
    stefanprodan committed Jul 27, 2022
    Copy the full SHA
    394c40e View commit details
  2. Merge pull request #206 from stefanprodan/update-swagger

    Update Swagger packages and definition
    stefanprodan authored Jul 27, 2022
    Copy the full SHA
    1a55e30 View commit details
  3. Release 6.1.7

    Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
    stefanprodan committed Jul 27, 2022
    Copy the full SHA
    9b9f11d View commit details
  4. Merge pull request #207 from stefanprodan/release-6.1.7

    Release 6.1.7
    stefanprodan authored Jul 27, 2022
    Copy the full SHA
    6d5b3d2 View commit details
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -87,7 +87,9 @@ release:
git push origin $(VERSION)

swagger:
go get github.com/swaggo/swag/cmd/swag
go install github.com/swaggo/swag/cmd/swag@latest
go get github.com/swaggo/swag/gen@latest
go get github.com/swaggo/swag/cmd/swag@latest
cd pkg/api && $$(go env GOPATH)/bin/swag init -g server.go

.PHONY: cue-mod
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ helm upgrade --install --wait frontend \
--set backend=http://backend-podinfo:9898/echo \
podinfo/podinfo

helm test frontend
helm test frontend --namespace test

helm upgrade --install --wait backend \
--namespace test \
4 changes: 2 additions & 2 deletions charts/podinfo/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
version: 6.1.6
appVersion: 6.1.6
version: 6.1.7
appVersion: 6.1.7
name: podinfo
engine: gotpl
description: Podinfo Helm chart for Kubernetes
2 changes: 1 addition & 1 deletion charts/podinfo/values-prod.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ backends: []

image:
repository: ghcr.io/stefanprodan/podinfo
tag: 6.1.6
tag: 6.1.7
pullPolicy: IfNotPresent

ui:
2 changes: 1 addition & 1 deletion charts/podinfo/values.yaml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ backends: []

image:
repository: ghcr.io/stefanprodan/podinfo
tag: 6.1.6
tag: 6.1.7
pullPolicy: IfNotPresent

ui:
2 changes: 1 addition & 1 deletion cue/main.cue
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ app: podinfo.#Application & {
name: "podinfo"
namespace: "default"
}
image: tag: "6.1.6"
image: tag: "6.1.7"
resources: requests: {
cpu: "100m"
memory: "16Mi"
2 changes: 1 addition & 1 deletion deploy/bases/backend/deployment.yaml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ spec:
spec:
containers:
- name: backend
image: ghcr.io/stefanprodan/podinfo:6.1.6
image: ghcr.io/stefanprodan/podinfo:6.1.7
imagePullPolicy: IfNotPresent
ports:
- name: http
2 changes: 1 addition & 1 deletion deploy/bases/frontend/deployment.yaml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ spec:
spec:
containers:
- name: frontend
image: ghcr.io/stefanprodan/podinfo:6.1.6
image: ghcr.io/stefanprodan/podinfo:6.1.7
imagePullPolicy: IfNotPresent
ports:
- name: http
2 changes: 1 addition & 1 deletion deploy/webapp/backend/deployment.yaml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ spec:
serviceAccountName: webapp
containers:
- name: backend
image: ghcr.io/stefanprodan/podinfo:6.1.6
image: ghcr.io/stefanprodan/podinfo:6.1.7
imagePullPolicy: IfNotPresent
ports:
- name: http
2 changes: 1 addition & 1 deletion deploy/webapp/frontend/deployment.yaml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ spec:
serviceAccountName: webapp
containers:
- name: frontend
image: ghcr.io/stefanprodan/podinfo:6.1.6
image: ghcr.io/stefanprodan/podinfo:6.1.7
imagePullPolicy: IfNotPresent
ports:
- name: http
57 changes: 30 additions & 27 deletions go.mod
Original file line number Diff line number Diff line change
@@ -3,35 +3,34 @@ module github.com/stefanprodan/podinfo
go 1.18

require (
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
github.com/chzyer/readline v1.5.0
github.com/chzyer/readline v1.5.1
github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
github.com/fatih/color v1.13.0
github.com/fsnotify/fsnotify v1.5.4
github.com/gomodule/redigo v1.8.8
github.com/gomodule/redigo v1.8.9
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.5.0
github.com/prometheus/client_golang v1.12.2
github.com/spf13/cobra v1.4.0
github.com/spf13/cobra v1.5.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.12.0
github.com/swaggo/http-swagger v1.2.8
github.com/swaggo/swag v1.8.2
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.32.0
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.32.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0
go.opentelemetry.io/contrib/propagators/aws v1.7.0
go.opentelemetry.io/contrib/propagators/b3 v1.7.0
go.opentelemetry.io/contrib/propagators/jaeger v1.7.0
go.opentelemetry.io/contrib/propagators/ot v1.7.0
go.opentelemetry.io/otel v1.7.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.7.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0
go.opentelemetry.io/otel/sdk v1.7.0
go.opentelemetry.io/otel/trace v1.7.0
github.com/swaggo/http-swagger v1.3.0
github.com/swaggo/swag v1.8.4
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.33.0
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.33.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.33.0
go.opentelemetry.io/contrib/propagators/aws v1.8.0
go.opentelemetry.io/contrib/propagators/b3 v1.8.0
go.opentelemetry.io/contrib/propagators/jaeger v1.8.0
go.opentelemetry.io/contrib/propagators/ot v1.8.0
go.opentelemetry.io/otel v1.8.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.8.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.8.0
go.opentelemetry.io/otel/sdk v1.8.0
go.opentelemetry.io/otel/trace v1.8.0
go.uber.org/zap v1.21.0
golang.org/x/net v0.0.0-20220526153639-5463443f8c37
google.golang.org/grpc v1.46.2
golang.org/x/net v0.0.0-20220726230323-06994584191e
google.golang.org/grpc v1.48.0
)

// Fix CVE-2022-28948
@@ -42,7 +41,9 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -65,22 +66,24 @@ require (
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/subosito/gotenv v1.3.0 // indirect
github.com/swaggo/files v0.0.0-20210815190702-a29dd2bc99b2 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 // indirect
go.opentelemetry.io/otel/metric v0.30.0 // indirect
go.opentelemetry.io/proto/otlp v0.16.0 // indirect
github.com/swaggo/files v0.0.0-20220610200504-28940afbdbfe // indirect
github.com/urfave/cli/v2 v2.3.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.8.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/proto/otlp v0.18.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.10 // indirect
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading