Skip to content

Commit

Permalink
Merge pull request #1886 from binbin-li/release-1.3
Browse files Browse the repository at this point in the history 
ci: fix tagging in publish-ghcr workflow (#1884)
  • Loading branch information
@binbin-li
binbin-li authored Oct 23, 2024
2 parents 3ccccdb + 7700de4 commit b274230
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 60 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-package.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
--attest type=sbom \
--attest type=provenance,mode=max \
--platform linux/amd64,linux/arm64,linux/arm/v7 \
--build-arg LDFLAGS="-X github.com/ratify-project/ratify/internal/version.Version=$(TAG)" \
--build-arg LDFLAGS="-X github.com/ratify-project/ratify/internal/version.Version=$TAG" \
--label org.opencontainers.image.revision=${{ github.sha }} \
-t ${{ steps.prepare.outputs.baseref }} \
--push .
Expand All @@ -79,7 +79,7 @@ jobs:
--build-arg build_licensechecker=true \
--build-arg build_schemavalidator=true \
--build-arg build_vulnerabilityreport=true \
--build-arg LDFLAGS="-X github.com/ratify-project/ratify/internal/version.Version=$(TAG)" \
--build-arg LDFLAGS="-X github.com/ratify-project/ratify/internal/version.Version=$TAG" \
--label org.opencontainers.image.revision=${{ github.sha }} \
-t ${{ steps.prepare.outputs.ref }} \
--push .
Expand Down
1 change: 1 addition & 0 deletions charts/ratify/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Values marked `# DEPRECATED` in the `values.yaml` as well as **DEPRECATED** in t
| replicaCount | The number of Ratify replicas in deployment | 1 |
| affinity | Pod affinity for the Ratify deployment | `{}` |
| tolerations | Pod tolerations for the Ratify deployment | `[]` |
| env | Environment variables for Ratify container | `[]` |
| notationCerts | An array of public certificate/certificate chain used to create inline certstore used by Notation verifier | `` |
| cosignKeys | An array of public keys used to create inline key management providers used by Cosign verifier | `[]` |
| notation.enabled | Enables/disables the built-in notation verifier. MUST be set to true for notation verification. | `true` |
Expand Down
3 changes: 3 additions & 0 deletions charts/ratify/templates/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ spec:
readOnly: true
{{- end }}
env:
{{- with .Values.env }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.logger.level }}
- name: RATIFY_LOG_LEVEL
value: {{ .Values.logger.level }}
Expand Down
7 changes: 6 additions & 1 deletion charts/ratify/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,9 @@ akvCertConfig: # DEPRECATED: Use azurekeyvault instead
cert2Name: # DEPRECATED: Use azurekeyvault.certificates instead
cert2Version: # DEPRECATED: Use azurekeyvault.certificates instead
certificates: # DEPRECATED: Use azurekeyvault.certificates instead
tenantId: # DEPRECATED: Use azurekeyvault.tenantId instead
tenantId: # DEPRECATED: Use azurekeyvault.tenantId instead

# env: environment variables for ratify container
env: []
# - name: https_proxy
# value: http://proxy-server:80
31 changes: 16 additions & 15 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/cespare/xxhash/v2 v2.3.0
github.com/dapr/go-sdk v1.8.0
github.com/dgraph-io/ristretto v0.1.1
github.com/distribution/reference v0.5.0
github.com/distribution/reference v0.6.0
github.com/docker/cli v27.1.2+incompatible
github.com/docker/distribution v2.8.3+incompatible
github.com/fsnotify/fsnotify v1.7.0
Expand All @@ -33,7 +33,7 @@ require (
github.com/notaryproject/notation-plugin-framework-go v1.0.0
github.com/open-policy-agent/cert-controller v0.8.0
github.com/open-policy-agent/frameworks/constraint v0.0.0-20230411224310-3f237e2710fa
github.com/open-policy-agent/opa v0.63.0
github.com/open-policy-agent/opa v0.68.0
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0
github.com/owenrumney/go-sarif/v2 v2.3.3
Expand All @@ -45,10 +45,10 @@ require (
github.com/spf13/cobra v1.8.1
github.com/xlab/treeprint v1.1.0
go.opentelemetry.io/otel/exporters/prometheus v0.49.0
go.opentelemetry.io/otel/metric v1.27.0
go.opentelemetry.io/otel/metric v1.28.0
go.opentelemetry.io/otel/sdk/metric v1.27.0
golang.org/x/sync v0.8.0
google.golang.org/grpc v1.64.1
google.golang.org/grpc v1.66.0
google.golang.org/protobuf v1.34.2
k8s.io/api v0.28.13
k8s.io/apimachinery v0.28.13
Expand All @@ -65,6 +65,7 @@ require (
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
github.com/ThalesIgnite/crypto11 v1.2.5 // indirect
github.com/agnivade/levenshtein v1.1.1 // indirect
Expand Down Expand Up @@ -123,7 +124,7 @@ require (
github.com/xanzy/go-gitlab v0.102.0 // indirect
github.com/yashtewari/glob-intersection v0.2.0 // indirect
go.step.sm/crypto v0.44.2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
gotest.tools/v3 v3.1.0 // indirect
sigs.k8s.io/release-utils v0.7.7 // indirect
)
Expand Down Expand Up @@ -171,7 +172,7 @@ require (
github.com/go-openapi/validate v0.24.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/glog v1.2.0 // indirect
github.com/golang/glog v1.2.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/certificate-transparency-go v1.1.8 // indirect
Expand All @@ -186,7 +187,7 @@ require (
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
github.com/magiconair/properties v1.8.7 // indirect
Expand All @@ -201,10 +202,10 @@ require (
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1
github.com/prometheus/client_golang v1.20.2
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.53.0 // indirect
github.com/prometheus/procfs v0.15.0 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/sassoftware/relic v7.2.1+incompatible // indirect
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
Expand All @@ -227,21 +228,21 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0
go.mongodb.org/mongo-driver v1.14.0 // indirect
go.opentelemetry.io/otel v1.27.0
go.opentelemetry.io/otel/sdk v1.27.0
go.opentelemetry.io/otel/trace v1.27.0 // indirect
go.opentelemetry.io/otel v1.28.0
go.opentelemetry.io/otel/sdk v1.28.0
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.26.0
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/time v0.6.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
Loading

0 comments on commit b274230

Please sign in to comment.