Skip to content

Commit

Permalink
fix: ordering of functionality for setting and evaluating label expre…
Browse files Browse the repository at this point in the history 
…ssions (argoproj#9661)

* chore(deps): bump docker/login-action from 1 to 2 (#1)

Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@v1...v2)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump docker/setup-buildx-action from 1 to 2 (#3)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 2.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](docker/setup-buildx-action@v1...v2)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump docker/setup-qemu-action from 1 to 2 (#4)

Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 1 to 2.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](docker/setup-qemu-action@v1...v2)

---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/minio/minio-go/v7 from 7.0.24 to 7.0.26 (#5)

Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.24 to 7.0.26.
- [Release notes](https://github.com/minio/minio-go/releases)
- [Commits](minio/minio-go@v7.0.24...v7.0.26)

---
updated-dependencies:
- dependency-name: github.com/minio/minio-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.75.0 to 0.78.0 (#6)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.75.0 to 0.78.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.75.0...v0.78.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/argoproj/pkg from 0.12.0 to 0.13.2 (#7)

Bumps [github.com/argoproj/pkg](https://github.com/argoproj/pkg) from 0.12.0 to 0.13.2.
- [Release notes](https://github.com/argoproj/pkg/releases)
- [Commits](argoproj/pkg@v0.12.0...v0.13.2)

---
updated-dependencies:
- dependency-name: github.com/argoproj/pkg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.78.0 to 0.79.0 (#8)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.78.0 to 0.79.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.78.0...v0.79.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/coreos/go-oidc/v3 from 3.1.0 to 3.2.0 (#9)

Bumps [github.com/coreos/go-oidc/v3](https://github.com/coreos/go-oidc) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/coreos/go-oidc/releases)
- [Commits](coreos/go-oidc@v3.1.0...v3.2.0)

---
updated-dependencies:
- dependency-name: github.com/coreos/go-oidc/v3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/aliyun/aliyun-oss-go-sdk (#10)

Bumps [github.com/aliyun/aliyun-oss-go-sdk](https://github.com/aliyun/aliyun-oss-go-sdk) from 2.2.2+incompatible to 2.2.3+incompatible.
- [Release notes](https://github.com/aliyun/aliyun-oss-go-sdk/releases)
- [Changelog](https://github.com/aliyun/aliyun-oss-go-sdk/blob/master/CHANGELOG.md)
- [Commits](aliyun/aliyun-oss-go-sdk@v2.2.2...v2.2.3)

---
updated-dependencies:
- dependency-name: github.com/aliyun/aliyun-oss-go-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/prometheus/client_golang (#11)

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.12.1 to 1.12.2.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/v1.12.2/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.12.1...v1.12.2)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.79.0 to 0.80.0 (#12)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.79.0 to 0.80.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.79.0...v0.80.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump cloud.google.com/go/storage from 1.22.0 to 1.22.1 (#13)

Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.22.0 to 1.22.1.
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md)
- [Commits](googleapis/google-cloud-go@spanner/v1.22.0...storage/v1.22.1)

---
updated-dependencies:
- dependency-name: cloud.google.com/go/storage
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.80.0 to 0.81.0 (#14)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.80.0 to 0.81.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.80.0...v0.81.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/aliyun/aliyun-oss-go-sdk (#15)

Bumps [github.com/aliyun/aliyun-oss-go-sdk](https://github.com/aliyun/aliyun-oss-go-sdk) from 2.2.3+incompatible to 2.2.4+incompatible.
- [Release notes](https://github.com/aliyun/aliyun-oss-go-sdk/releases)
- [Changelog](https://github.com/aliyun/aliyun-oss-go-sdk/blob/master/CHANGELOG.md)
- [Commits](aliyun/aliyun-oss-go-sdk@v2.2.3...v2.2.4)

---
updated-dependencies:
- dependency-name: github.com/aliyun/aliyun-oss-go-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/minio/minio-go/v7 from 7.0.26 to 7.0.27 (#16)

Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.26 to 7.0.27.
- [Release notes](https://github.com/minio/minio-go/releases)
- [Commits](minio/minio-go@v7.0.26...v7.0.27)

---
updated-dependencies:
- dependency-name: github.com/minio/minio-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/spf13/viper from 1.11.0 to 1.12.0 (#17)

Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/spf13/viper/releases)
- [Commits](spf13/viper@v1.11.0...v1.12.0)

---
updated-dependencies:
- dependency-name: github.com/spf13/viper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.81.0 to 0.82.0 (#18)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.81.0 to 0.82.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.81.0...v0.82.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.82.0 to 0.83.0 (#19)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.82.0 to 0.83.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.82.0...v0.83.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/stretchr/testify from 1.7.1 to 1.7.2 (#20)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.1 to 1.7.2.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.7.1...v1.7.2)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump actions/setup-python from 3 to 4 (#21)

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/minio/minio-go/v7 from 7.0.27 to 7.0.28 (#22)

Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.27 to 7.0.28.
- [Release notes](https://github.com/minio/minio-go/releases)
- [Commits](minio/minio-go@v7.0.27...v7.0.28)

---
updated-dependencies:
- dependency-name: github.com/minio/minio-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.83.0 to 0.84.0 (#23)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.83.0 to 0.84.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.83.0...v0.84.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/argoproj/pkg from 0.13.2 to 0.13.3 (#24)

Bumps [github.com/argoproj/pkg](https://github.com/argoproj/pkg) from 0.13.2 to 0.13.3.
- [Release notes](https://github.com/argoproj/pkg/releases)
- [Commits](argoproj/pkg@v0.13.2...v0.13.3)

---
updated-dependencies:
- dependency-name: github.com/argoproj/pkg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/prometheus/common from 0.34.0 to 0.35.0 (#25)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.34.0 to 0.35.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.34.0...v0.35.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/minio/minio-go/v7 from 7.0.28 to 7.0.29 (#26)

Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.28 to 7.0.29.
- [Release notes](https://github.com/minio/minio-go/releases)
- [Commits](minio/minio-go@v7.0.28...v7.0.29)

---
updated-dependencies:
- dependency-name: github.com/minio/minio-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.84.0 to 0.85.0 (#27)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.84.0 to 0.85.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.84.0...v0.85.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/stretchr/testify from 1.7.2 to 1.7.4 (#29)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.2 to 1.7.4.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.7.2...v1.7.4)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/argoproj/pkg from 0.13.3 to 0.13.6 (#30)

Bumps [github.com/argoproj/pkg](https://github.com/argoproj/pkg) from 0.13.3 to 0.13.6.
- [Release notes](https://github.com/argoproj/pkg/releases)
- [Commits](argoproj/pkg@v0.13.3...v0.13.6)

---
updated-dependencies:
- dependency-name: github.com/argoproj/pkg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump cloud.google.com/go/storage from 1.22.1 to 1.23.0 (#31)

Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.22.1 to 1.23.0.
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md)
- [Commits](googleapis/google-cloud-go@pubsub/v1.22.1...pubsub/v1.23.0)

---
updated-dependencies:
- dependency-name: cloud.google.com/go/storage
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/stretchr/testify from 1.7.4 to 1.7.5 (#32)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.4 to 1.7.5.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.7.4...v1.7.5)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.85.0 to 0.86.0 (#33)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.85.0 to 0.86.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.85.0...v0.86.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/minio/minio-go/v7 from 7.0.29 to 7.0.30 (#34)

Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.29 to 7.0.30.
- [Release notes](https://github.com/minio/minio-go/releases)
- [Commits](minio/minio-go@v7.0.29...v7.0.30)

---
updated-dependencies:
- dependency-name: github.com/minio/minio-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/stretchr/testify from 1.7.5 to 1.8.0 (#36)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.5 to 1.8.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.7.5...v1.8.0)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump dependabot/fetch-metadata from 1.3.1 to 1.3.3 (#37)

Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.3.1 to 1.3.3.
- [Release notes](https://github.com/dependabot/fetch-metadata/releases)
- [Commits](dependabot/fetch-metadata@v1.3.1...v1.3.3)

---
updated-dependencies:
- dependency-name: dependabot/fetch-metadata
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/minio/minio-go/v7 from 7.0.30 to 7.0.31 (#38)

Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.30 to 7.0.31.
- [Release notes](https://github.com/minio/minio-go/releases)
- [Commits](minio/minio-go@v7.0.30...v7.0.31)

---
updated-dependencies:
- dependency-name: github.com/minio/minio-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/prometheus/common from 0.35.0 to 0.36.0 (#39)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.35.0 to 0.36.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.35.0...v0.36.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.86.0 to 0.87.0 (#40)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.86.0 to 0.87.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.86.0...v0.87.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/prometheus/common from 0.36.0 to 0.37.0 (#41)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.36.0 to 0.37.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.36.0...v0.37.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/sirupsen/logrus from 1.8.1 to 1.9.0 (#42)

Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) from 1.8.1 to 1.9.0.
- [Release notes](https://github.com/sirupsen/logrus/releases)
- [Changelog](https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md)
- [Commits](sirupsen/logrus@v1.8.1...v1.9.0)

---
updated-dependencies:
- dependency-name: github.com/sirupsen/logrus
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.87.0 to 0.88.0 (#43)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.87.0 to 0.88.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.87.0...v0.88.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump cloud.google.com/go/storage from 1.23.0 to 1.24.0 (#44)

Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.23.0 to 1.24.0.
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md)
- [Commits](googleapis/google-cloud-go@pubsub/v1.23.0...pubsub/v1.24.0)

---
updated-dependencies:
- dependency-name: cloud.google.com/go/storage
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/minio/minio-go/v7 from 7.0.31 to 7.0.32 (#45)

Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.31 to 7.0.32.
- [Release notes](https://github.com/minio/minio-go/releases)
- [Commits](minio/minio-go@v7.0.31...v7.0.32)

---
updated-dependencies:
- dependency-name: github.com/minio/minio-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.88.0 to 0.89.0 (#46)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.88.0 to 0.89.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.88.0...v0.89.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.89.0 to 0.90.0 (#47)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.89.0 to 0.90.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.89.0...v0.90.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/minio/minio-go/v7 from 7.0.32 to 7.0.33 (#48)

Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.32 to 7.0.33.
- [Release notes](https://github.com/minio/minio-go/releases)
- [Commits](minio/minio-go@v7.0.32...v7.0.33)

---
updated-dependencies:
- dependency-name: github.com/minio/minio-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.90.0 to 0.91.0 (#49)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.90.0 to 0.91.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.90.0...v0.91.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/minio/minio-go/v7 from 7.0.33 to 7.0.34 (#50)

Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.33 to 7.0.34.
- [Release notes](https://github.com/minio/minio-go/releases)
- [Commits](minio/minio-go@v7.0.33...v7.0.34)

---
updated-dependencies:
- dependency-name: github.com/minio/minio-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/tidwall/gjson from 1.14.1 to 1.14.2 (#51)

Bumps [github.com/tidwall/gjson](https://github.com/tidwall/gjson) from 1.14.1 to 1.14.2.
- [Release notes](https://github.com/tidwall/gjson/releases)
- [Commits](tidwall/gjson@v1.14.1...v1.14.2)

---
updated-dependencies:
- dependency-name: github.com/tidwall/gjson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/prometheus/client_golang (#52)

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.12.2 to 1.13.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.12.2...v1.13.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.91.0 to 0.92.0 (#53)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.91.0 to 0.92.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.91.0...v0.92.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump cloud.google.com/go/storage from 1.24.0 to 1.25.0 (#54)

Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.24.0 to 1.25.0.
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md)
- [Commits](googleapis/google-cloud-go@pubsub/v1.24.0...spanner/v1.25.0)

---
updated-dependencies:
- dependency-name: cloud.google.com/go/storage
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.92.0 to 0.93.0 (#55)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.92.0 to 0.93.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.92.0...v0.93.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/argoproj-labs/argo-dataflow (#56)

Bumps [github.com/argoproj-labs/argo-dataflow](https://github.com/argoproj-labs/argo-dataflow) from 0.10.2 to 0.10.3.
- [Release notes](https://github.com/argoproj-labs/argo-dataflow/releases)
- [Changelog](https://github.com/argoproj-labs/argo-dataflow/blob/main/CHANGELOG.md)
- [Commits](argoproj-labs/old-argo-dataflow@v0.10.2...v0.10.3)

---
updated-dependencies:
- dependency-name: github.com/argoproj-labs/argo-dataflow
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/tidwall/gjson from 1.14.2 to 1.14.3 (#57)

Bumps [github.com/tidwall/gjson](https://github.com/tidwall/gjson) from 1.14.2 to 1.14.3.
- [Release notes](https://github.com/tidwall/gjson/releases)
- [Commits](tidwall/gjson@v1.14.2...v1.14.3)

---
updated-dependencies:
- dependency-name: github.com/tidwall/gjson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump github.com/aliyun/aliyun-oss-go-sdk (#58)

Bumps [github.com/aliyun/aliyun-oss-go-sdk](https://github.com/aliyun/aliyun-oss-go-sdk) from 2.2.4+incompatible to 2.2.5+incompatible.
- [Release notes](https://github.com/aliyun/aliyun-oss-go-sdk/releases)
- [Changelog](https://github.com/aliyun/aliyun-oss-go-sdk/blob/master/CHANGELOG.md)
- [Commits](aliyun/aliyun-oss-go-sdk@v2.2.4...v2.2.5)

---
updated-dependencies:
- dependency-name: github.com/aliyun/aliyun-oss-go-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump google.golang.org/api from 0.93.0 to 0.94.0 (#59)

Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.93.0 to 0.94.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases)
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md)
- [Commits](googleapis/google-api-go-client@v0.93.0...v0.94.0)

---
updated-dependencies:
- dependency-name: google.golang.org/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump cloud.google.com/go/storage from 1.25.0 to 1.26.0 (#60)

Bumps [cloud.google.com/go/storage](https://github.com/googleapis/google-cloud-go) from 1.25.0 to 1.26.0.
- [Release notes](https://github.com/googleapis/google-cloud-go/releases)
- [Changelog](https://github.com/googleapis/google-cloud-go/blob/main/CHANGES.md)
- [Commits](googleapis/google-cloud-go@pubsub/v1.25.0...spanner/v1.26.0)

---
updated-dependencies:
- dependency-name: cloud.google.com/go/storage
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: breaking updateWorkflowMetadata() into two functions

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* fix: separate the update of workflowMetadata global-params from the setting of the actual metadata

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* fix: move the code around a bit

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* fix: reorder evaluation of labelsFrom

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* fix: evaluate LabelsFrom

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* fix: don't think we need to do substitution of templates here

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* fix: empty commit

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* fix: adding unit test

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* chore: comments

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* fix: empty commit

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* chore: restore generation of Labels/Annotations maps

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* chore: comment

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* fix: should update globalParams too

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* fix: typo

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

* fix: empty commit

Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Julie Vogelman <julie_vogelman@intuit.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
@juliev0 @dependabot
juliev0 and dependabot[bot] committed Sep 28, 2022
1 parent 4e34979 commit 2f5e753
Show file tree
Hide file tree
Showing 12 changed files with 133 additions and 54 deletions.
79 changes: 64 additions & 15 deletions workflow/controller/operator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,22 +482,30 @@ func (woc *wfOperationCtx) operate(ctx context.Context) {
}
}

// set Labels and Annotations for the Workflow
// Also, since we're setting Labels and Annotations we need to find any
// parameters formatted as "workflow.labels.<param>" or "workflow.annotations.<param>"
// and perform substitution
func (woc *wfOperationCtx) updateWorkflowMetadata() error {
updatedParams := make(common.Parameters)
if md := woc.execWf.Spec.WorkflowMetadata; md != nil {
if woc.wf.ObjectMeta.Labels == nil {
woc.wf.ObjectMeta.Labels = make(map[string]string)
if woc.wf.Labels == nil {
woc.wf.Labels = make(map[string]string)
}
for n, v := range md.Labels {
woc.wf.Labels[n] = v
woc.globalParams["workflow.labels."+n] = v
updatedParams["workflow.labels."+n] = v
}
if woc.wf.ObjectMeta.Annotations == nil {
woc.wf.ObjectMeta.Annotations = make(map[string]string)
if woc.wf.Annotations == nil {
woc.wf.Annotations = make(map[string]string)
}
for n, v := range md.Annotations {
woc.wf.Annotations[n] = v
woc.globalParams["workflow.annotations."+n] = v
updatedParams["workflow.annotations."+n] = v
}

env := env.GetFuncMap(template.EnvMap(woc.globalParams))
for n, f := range md.LabelsFrom {
r, err := expr.Eval(f.Expression, env)
Expand All @@ -510,8 +518,16 @@ func (woc *wfOperationCtx) updateWorkflowMetadata() error {
}
woc.wf.Labels[n] = v
woc.globalParams["workflow.labels."+n] = v
updatedParams["workflow.labels."+n] = v
}
woc.updated = true

// Now we need to do any substitution that involves these labels
err := woc.substituteGlobalVariables(updatedParams)
if err != nil {
return err
}

}
return nil
}
Expand Down Expand Up @@ -570,6 +586,23 @@ func (woc *wfOperationCtx) setGlobalParameters(executionParameters wfv1.Argument
woc.globalParams["workflow.parameters."+param.Name] = param.Value.String()
}
}
if woc.wf.Status.Outputs != nil {
for _, param := range woc.wf.Status.Outputs.Parameters {
if param.HasValue() {
woc.globalParams["workflow.outputs.parameters."+param.Name] = param.GetValue()
}
}
}

/////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Set global parameters based on Labels and Annotations, both those that are defined in the execWf.ObjectMeta
// and those that are defined in the execWf.Spec.WorkflowMetadata
// Note: we no longer set globalParams based on LabelsFrom expressions here since they may themselves use parameters
// and thus will need to be evaluated later based on the evaluation of those parameters
/////////////////////////////////////////////////////////////////////////////////////////////////////////////

md := woc.execWf.Spec.WorkflowMetadata

if workflowAnnotations, err := json.Marshal(woc.wf.ObjectMeta.Annotations); err == nil {
woc.globalParams[common.GlobalVarWorkflowAnnotations] = string(workflowAnnotations)
}
Expand All @@ -580,15 +613,30 @@ func (woc *wfOperationCtx) setGlobalParameters(executionParameters wfv1.Argument
woc.globalParams[common.GlobalVarWorkflowLabels] = string(workflowLabels)
}
for k, v := range woc.wf.ObjectMeta.Labels {
woc.globalParams["workflow.labels."+k] = v
// if the Label will get overridden by a LabelsFrom expression later, don't set it now
if md != nil {
_, existsLabelsFrom := md.LabelsFrom[k]
if !existsLabelsFrom {
woc.globalParams["workflow.labels."+k] = v
}
} else {
woc.globalParams["workflow.labels."+k] = v
}
}
if woc.wf.Status.Outputs != nil {
for _, param := range woc.wf.Status.Outputs.Parameters {
if param.HasValue() {
woc.globalParams["workflow.outputs.parameters."+param.Name] = param.GetValue()

if md != nil {
for n, v := range md.Labels {
// if the Label will get overridden by a LabelsFrom expression later, don't set it now
_, existsLabelsFrom := md.LabelsFrom[n]
if !existsLabelsFrom {
woc.globalParams["workflow.labels."+n] = v
}
}
for n, v := range md.Annotations {
woc.globalParams["workflow.annotations."+n] = v
}
}

return nil
}

Expand Down Expand Up @@ -3532,16 +3580,17 @@ func (woc *wfOperationCtx) setExecWorkflow(ctx context.Context) error {
woc.markWorkflowFailed(ctx, fmt.Sprintf("failed to set global parameters: %s", err.Error()))
return err
}

err = woc.substituteGlobalVariables(woc.globalParams)
if err != nil {
return err
}
if woc.wf.Status.Phase == wfv1.WorkflowUnknown {
if err := woc.updateWorkflowMetadata(); err != nil {
woc.markWorkflowError(ctx, err)
return err
}
}
err = woc.substituteGlobalVariables()
if err != nil {
return err
}

// runtime value will be set after the substitution, otherwise will not be reflected from stored wf spec
woc.setGlobalRuntimeParameters()
Expand Down Expand Up @@ -3647,7 +3696,7 @@ func (woc *wfOperationCtx) mergedTemplateDefaultsInto(originalTmpl *wfv1.Templat
return nil
}

func (woc *wfOperationCtx) substituteGlobalVariables() error {
func (woc *wfOperationCtx) substituteGlobalVariables(params common.Parameters) error {
execWfSpec := woc.execWf.Spec

// To Avoid the stale Global parameter value substitution to templates.
Expand All @@ -3659,7 +3708,7 @@ func (woc *wfOperationCtx) substituteGlobalVariables() error {
return err
}

resolveSpec, err := template.Replace(string(wfSpec), woc.globalParams, true)
resolveSpec, err := template.Replace(string(wfSpec), params, true)
if err != nil {
return err
}
Expand Down
12 changes: 10 additions & 2 deletions workflow/controller/operator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7067,8 +7067,8 @@ func TestSubstituteGlobalVariablesLabelsAnnotations(t *testing.T) {
// entire template referenced; value not contained in WorkflowTemplate or Workflow
workflow: "@testdata/workflow-sub-test-1.yaml",
workflowTemplate: "@testdata/workflow-template-sub-test-1.yaml",
expectedMutexName: "{{workflow.labels.mutex-name}}",
expectedSchedulerName: "{{workflow.annotations.scheduler-name}}",
expectedMutexName: "{{workflow.labels.mutexName}}",
expectedSchedulerName: "{{workflow.annotations.schedulerName}}",
},
{
// entire template referenced; value is in Workflow.Labels
Expand Down Expand Up @@ -7106,6 +7106,14 @@ func TestSubstituteGlobalVariablesLabelsAnnotations(t *testing.T) {
expectedMutexName: "myMutex",
expectedSchedulerName: "myScheduler",
},
{
// this checks that we can use a sprig expression to set a label (using workflowMetadata.labelsFrom)
// and the result of that label can also be evaluated in the spec
workflow: "@testdata/workflow-sub-test-6.yaml",
workflowTemplate: "@testdata/workflow-template-sub-test-2.yaml",
expectedMutexName: "wfMetadataScheduler",
expectedSchedulerName: "wfMetadataScheduler",
},
}

for _, tt := range tests {
Expand Down
4 changes: 2 additions & 2 deletions workflow/controller/testdata/workflow-sub-test-1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
name: workflow-template-submittable
synchronization:
mutex:
name: "{{workflow.labels.mutex-name}}"
schedulerName: "{{workflow.annotations.scheduler-name}}"
name: "{{workflow.labels.mutexName}}"
schedulerName: "{{workflow.annotations.schedulerName}}"
8 changes: 4 additions & 4 deletions workflow/controller/testdata/workflow-sub-test-2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ metadata:
generateName: workflow-template-hello-world-
namespace: test
labels:
mutex-name: myMutex
mutexName: myMutex
annotations:
scheduler-name: myScheduler
schedulerName: myScheduler
spec:
workflowTemplateRef:
name: workflow-template-submittable
synchronization:
mutex:
name: "{{workflow.labels.mutex-name}}"
schedulerName: "{{workflow.annotations.scheduler-name}}"
name: "{{workflow.labels.mutexName}}"
schedulerName: "{{workflow.annotations.schedulerName}}"
12 changes: 6 additions & 6 deletions workflow/controller/testdata/workflow-sub-test-3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ metadata:
generateName: workflow-template-hello-world-
namespace: test
labels:
mutex-name: myMutex
mutexName: myMutex
annotations:
scheduler-name: myScheduler
schedulerName: myScheduler
spec:
workflowTemplateRef:
name: workflow-template-submittable
synchronization:
mutex:
name: "{{workflow.labels.mutex-name}}"
schedulerName: "{{workflow.annotations.scheduler-name}}"
name: "{{workflow.labels.mutexName}}"
schedulerName: "{{workflow.annotations.schedulerName}}"
workflowMetadata:
labels:
mutex-name: wfMetadataMutex
mutexName: wfMetadataMutex
annotations:
scheduler-name: wfMetadataScheduler
schedulerName: wfMetadataScheduler
12 changes: 6 additions & 6 deletions workflow/controller/testdata/workflow-sub-test-4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ apiVersion: argoproj.io/v1alpha1
kind: Workflow
metadata:
generateName: workflow-template-hello-world-
namespace: test
namespace: argo
labels:
mutex-name: myMutex
mutexName: myOverrideMutex
annotations:
scheduler-name: myScheduler
schedulerName: myScheduler
spec:
workflowTemplateRef:
name: workflow-template-submittable
synchronization:
mutex:
name: "{{workflow.labels.mutex-name}}"
schedulerName: "{{workflow.annotations.scheduler-name}}"
name: "{{workflow.labels.mutexName}}"
schedulerName: "{{workflow.annotations.schedulerName}}"
workflowMetadata:
annotations:
scheduler-name: wfMetadataScheduler
schedulerName: wfMetadataScheduler
8 changes: 4 additions & 4 deletions workflow/controller/testdata/workflow-sub-test-5.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
generateName: workflow-template-hello-world-
namespace: test
labels:
mutex-name: myMutex
mutexName: myMutex
annotations:
scheduler-name: myScheduler
schedulerName: myScheduler
spec:
entrypoint: myTemplate
templates:
Expand All @@ -18,5 +18,5 @@ spec:
template: whalesay-template
synchronization:
mutex:
name: "{{workflow.labels.mutex-name}}"
schedulerName: "{{workflow.annotations.scheduler-name}}"
name: "{{workflow.labels.mutexName}}"
schedulerName: "{{workflow.annotations.schedulerName}}"
22 changes: 22 additions & 0 deletions workflow/controller/testdata/workflow-sub-test-6.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
apiVersion: argoproj.io/v1alpha1
kind: Workflow
metadata:
generateName: workflow-template-hello-world-
namespace: test
labels:
mutexName: myMutex
annotations:
schedulerName: myScheduler
spec:
workflowTemplateRef:
name: workflow-template-submittable
synchronization:
mutex:
name: "{{workflow.labels.mutexName}}"
schedulerName: "{{workflow.annotations.schedulerName}}"
workflowMetadata:
labelsFrom:
mutexName:
expression: "{{= sprig.quote(sprig.trim( workflow.annotations.schedulerName )) }}"
annotations:
schedulerName: wfMetadataScheduler
4 changes: 2 additions & 2 deletions workflow/controller/testdata/workflow-template-sub-test-1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
name: workflow-template-submittable
namespace: test
labels:
mutex-name: myMutex
mutexName: myMutex
annotations:
scheduler-name: myScheduler
schedulerName: myScheduler
spec:
entrypoint: whalesay-template
templates:
Expand Down
8 changes: 4 additions & 4 deletions workflow/controller/testdata/workflow-template-sub-test-2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
name: workflow-template-submittable
namespace: test
labels:
mutex-name: myMutex
mutexName: myMutex
annotations:
scheduler-name: myScheduler
schedulerName: myScheduler
spec:
entrypoint: whalesay-template
templates:
Expand All @@ -17,6 +17,6 @@ spec:
args: ['hello']
workflowMetadata:
labels:
mutex-name: wfMetadataTemplateMutex
mutexName: wfMetadataTemplateMutex
annotations:
scheduler-name: wfMetadataTemplateScheduler
schedulerName: wfMetadataTemplateScheduler
10 changes: 5 additions & 5 deletions workflow/controller/testdata/workflow-template-sub-test-3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apiVersion: argoproj.io/v1alpha1
kind: WorkflowTemplate
metadata:
name: workflow-template-submittable
namespace: test
namespace: argo
labels:
mutex-name: myMutex
mutexName: myMutex
annotations:
scheduler-name: myScheduler
schedulerName: myScheduler
spec:
arguments:
parameters:
Expand All @@ -21,7 +21,7 @@ spec:
args: ['hello']
workflowMetadata:
labelsFrom:
mutex-name:
mutexName:
expression: workflow.parameters.mutex
annotations:
scheduler-name: wfMetadataTemplateScheduler
schedulerName: wfMetadataTemplateScheduler
8 changes: 4 additions & 4 deletions workflow/controller/testdata/workflow-template-sub-test-4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
name: workflow-template-submittable
namespace: test
labels:
mutex-name: myMutex
mutexName: myMutex
annotations:
scheduler-name: myScheduler
schedulerName: myScheduler
spec:
templates:
- name: whalesay-template
Expand All @@ -16,6 +16,6 @@ spec:
args: ['hello']
workflowMetadata:
labels:
mutex-name: wfMetadataTemplateMutex
mutexName: wfMetadataTemplateMutex
annotations:
scheduler-name: wfMetadataTemplateScheduler
schedulerName: wfMetadataTemplateScheduler

0 comments on commit 2f5e753

Please sign in to comment.