Skip to content

Commit

Permalink
feat: Release 2.20.2 (#1927)
Browse files Browse the repository at this point in the history
* chore(dependabot): bump google.golang.org/grpc from 1.57.0 to 1.57.1 (#1817)

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.57.0 to 1.57.1.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.57.0...v1.57.1)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: indirect
...

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

* chore(dependabot): bump k8s.io/apimachinery from 0.28.1 to 0.28.3 (#1809)

Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.28.1 to 0.28.3.
- [Commits](kubernetes/apimachinery@v0.28.1...v0.28.3)

---
updated-dependencies:
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(dependabot): bump k8s.io/client-go from 0.28.1 to 0.28.3 (#1810)

Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.28.1 to 0.28.3.
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.28.1...v0.28.3)

---
updated-dependencies:
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(dependabot): bump go.uber.org/zap from 1.25.0 to 1.26.0 (#1794)

Bumps [go.uber.org/zap](https://github.com/uber-go/zap) from 1.25.0 to 1.26.0.
- [Release notes](https://github.com/uber-go/zap/releases)
- [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md)
- [Commits](uber-go/zap@v1.25.0...v1.26.0)

---
updated-dependencies:
- dependency-name: go.uber.org/zap
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump sigs.k8s.io/controller-runtime (#1811)

Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.15.1 to 0.16.3.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.15.1...v0.16.3)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* update code owner (#1831)

* update the owner

* remove path

* chore(dependabot): bump github.com/go-logr/logr from 1.2.4 to 1.3.0 (#1826)

Bumps [github.com/go-logr/logr](https://github.com/go-logr/logr) from 1.2.4 to 1.3.0.
- [Release notes](https://github.com/go-logr/logr/releases)
- [Changelog](https://github.com/go-logr/logr/blob/master/CHANGELOG.md)
- [Commits](go-logr/logr@v1.2.4...v1.3.0)

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

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

* Increase retires and curation for kustomize applying (#1833)

* stop print out password (#1832)

* update the owner

* remove path

* stop print out sensitive password

* chore(dependabot): bump github.com/onsi/ginkgo/v2 from 2.12.1 to 2.13.0 (#1824)

Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.12.1 to 2.13.0.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.12.1...v2.13.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump k8s.io/klog/v2 from 2.100.1 to 2.110.1 (#1825)

Bumps [k8s.io/klog/v2](https://github.com/kubernetes/klog) from 2.100.1 to 2.110.1.
- [Release notes](https://github.com/kubernetes/klog/releases)
- [Changelog](https://github.com/kubernetes/klog/blob/main/RELEASE.md)
- [Commits](kubernetes/klog@v2.100.1...v2.110.1)

---
updated-dependencies:
- dependency-name: k8s.io/klog/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump github.com/spf13/cobra from 1.7.0 to 1.8.0 (#1827)

Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](spf13/cobra@v1.7.0...v1.8.0)

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

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

* Adjusts the Conventional Commits GitHub Action config (#1830)

* Increase retry count for kustomize applying (#1838)

* chore(dependabot): bump sigs.k8s.io/kustomize/api (#1828)

Bumps [sigs.k8s.io/kustomize/api](https://github.com/kubernetes-sigs/kustomize) from 0.13.5-0.20230601165947-6ce0bf390ce3 to 0.15.0.
- [Release notes](https://github.com/kubernetes-sigs/kustomize/releases)
- [Commits](https://github.com/kubernetes-sigs/kustomize/commits/api/v0.15.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/kustomize/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump github.com/containerd/containerd (#1834)

Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.6 to 1.7.8.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](containerd/containerd@v1.7.6...v1.7.8)

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

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

* chore(dependabot): bump github.com/mandelsoft/vfs (#1835)

Bumps [github.com/mandelsoft/vfs](https://github.com/mandelsoft/vfs) from 0.0.0-20230714093241-d557f163aecd to 0.4.0.
- [Release notes](https://github.com/mandelsoft/vfs/releases)
- [Commits](https://github.com/mandelsoft/vfs/commits/v0.4)

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

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

* chore(dependabot): bump istio.io/client-go from 1.19.0 to 1.19.4 (#1839)

Bumps [istio.io/client-go](https://github.com/istio/client-go) from 1.19.0 to 1.19.4.
- [Commits](istio/client-go@1.19.0...1.19.4)

---
updated-dependencies:
- dependency-name: istio.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(dependabot): bump github.com/sigstore/cosign/v2 (#1829)

Bumps [github.com/sigstore/cosign/v2](https://github.com/sigstore/cosign) from 2.1.1 to 2.2.1.
- [Release notes](https://github.com/sigstore/cosign/releases)
- [Changelog](https://github.com/sigstore/cosign/blob/main/CHANGELOG.md)
- [Commits](sigstore/cosign@v2.1.1...v2.2.1)

---
updated-dependencies:
- dependency-name: github.com/sigstore/cosign/v2
  dependency-type: indirect
...

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

* chore(dependabot): bump github.com/onsi/ginkgo/v2 from 2.13.0 to 2.13.1 (#1843)

Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.13.0 to 2.13.1.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.13.0...v2.13.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(dependabot): bump github.com/go-logr/zapr from 1.2.4 to 1.3.0 (#1842)

Bumps [github.com/go-logr/zapr](https://github.com/go-logr/zapr) from 1.2.4 to 1.3.0.
- [Release notes](https://github.com/go-logr/zapr/releases)
- [Commits](go-logr/zapr@v1.2.4...v1.3.0)

---
updated-dependencies:
- dependency-name: github.com/go-logr/zapr
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump github.com/onsi/gomega from 1.27.10 to 1.30.0 (#1844)

Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.27.10 to 1.30.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.27.10...v1.30.0)

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

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

* chore(dependabot): bump github.com/fatih/color from 1.15.0 to 1.16.0 (#1845)

Bumps [github.com/fatih/color](https://github.com/fatih/color) from 1.15.0 to 1.16.0.
- [Release notes](https://github.com/fatih/color/releases)
- [Commits](fatih/color@v1.15.0...v1.16.0)

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

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

* chore(dependabot): bump istio.io/client-go from 1.19.4 to 1.20.0 (#1850)

Bumps [istio.io/client-go](https://github.com/istio/client-go) from 1.19.4 to 1.20.0.
- [Commits](istio/client-go@1.19.4...1.20.0)

---
updated-dependencies:
- dependency-name: istio.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump k8s.io/cli-runtime from 0.28.1 to 0.28.3 (#1849)

Bumps [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) from 0.28.1 to 0.28.3.
- [Commits](kubernetes/cli-runtime@v0.28.1...v0.28.3)

---
updated-dependencies:
- dependency-name: k8s.io/cli-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(dependabot): bump github.com/go-git/go-git/v5 from 5.9.0 to 5.10.0 (#1847)

Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) from 5.9.0 to 5.10.0.
- [Release notes](https://github.com/go-git/go-git/releases)
- [Commits](go-git/go-git@v5.9.0...v5.10.0)

---
updated-dependencies:
- dependency-name: github.com/go-git/go-git/v5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump k8s.io/client-go from 0.28.3 to 0.28.4 (#1852)

Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.28.3 to 0.28.4.
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.28.3...v0.28.4)

---
updated-dependencies:
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(dependabot): bump helm.sh/helm/v3 from 3.12.3 to 3.13.2 (#1841)

* chore(dependabot): bump helm.sh/helm/v3 from 3.12.3 to 3.13.2

Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.12.3 to 3.13.2.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.12.3...v3.13.2)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* allow for docker libs bump

* allow for Docker API negotiation

---------

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

* fix: Module creation e2e (#1860)

* fix: Adapt module creation e2e for new layer

* add new testcases for additional resource

* retrigger jobs

* remove prefixing module version with v

* pass sec-scanner file to fix config

* add sec scan label subprojects

* retrigger jobs

* parse subprojects

* fix order of contain assert

* adapt version for same version test

* chore(dependabot): bump github.com/go-jose/go-jose/v3 (#1861)

Bumps [github.com/go-jose/go-jose/v3](https://github.com/go-jose/go-jose) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/go-jose/go-jose/releases)
- [Changelog](https://github.com/go-jose/go-jose/blob/v3/CHANGELOG.md)
- [Commits](go-jose/go-jose@v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: github.com/go-jose/go-jose/v3
  dependency-type: indirect
...

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

* chore(dependabot): bump k8s.io/apiextensions-apiserver (#1856)

Bumps [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) from 0.28.3 to 0.28.4.
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.28.3...v0.28.4)

---
updated-dependencies:
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(dependabot): bump github.com/containerd/containerd (#1857)

Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.8 to 1.7.9.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](containerd/containerd@v1.7.8...v1.7.9)

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

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

* chore(dependabot): bump k8s.io/cli-runtime from 0.28.3 to 0.28.4 (#1858)

Bumps [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) from 0.28.3 to 0.28.4.
- [Commits](kubernetes/cli-runtime@v0.28.3...v0.28.4)

---
updated-dependencies:
- dependency-name: k8s.io/cli-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* fix: Fix Zip Slip Vulnerability (#1864)

* Fix Zip Slip Vulnerability

* Apply suggestions from code review

Co-authored-by: Benjamin Lindner <[email protected]>

---------

Co-authored-by: Benjamin Lindner <[email protected]>

* chore(dependabot): bump github.com/go-git/go-git/v5 (#1869)

Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) from 5.10.0 to 5.10.1.
- [Release notes](https://github.com/go-git/go-git/releases)
- [Commits](go-git/go-git@v5.10.0...v5.10.1)

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

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

* fix: Allow creating module for existing versions (#1865)

* Fix logging

* Implementation for the difference detection

* Adjust E2E test

* Fix E2E test

* Add OCI interface

* Start unit test

* Fix mock

* Unit test

* Code review comments

* feat: Introduce Mandatory Spec field for ModuleTemplate (#1866)

* Quick safe

* Add test

* Adapt e2e test

* Use shared pkg instead of api

* Use shared pkg instead of api

* Refactor unit test after upgrading KLM deps

* Use working dir in action

* Use working dir in action

* Fix nil pointer reference

* revert action changes

* fix wrong if condition

* set mandatory to optional

* Move mandatory to higher place

* chore(dependabot): bump github.com/onsi/ginkgo/v2 from 2.13.1 to 2.13.2 (#1870)

Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.13.1 to 2.13.2.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.13.1...v2.13.2)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(dependabot): bump github.com/containerd/containerd (#1871)

Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.9 to 1.7.10.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](containerd/containerd@v1.7.9...v1.7.10)

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

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

* Disable mocks from security scanning (#1872)

* Adds a sprint commits report (#1880)

* chore: Remove istio patching from legacy deploy (#1876)

* chore: Remove istio patching from legacy deploy

* retrigger jobs

* chore: Reference lifecycle manager api module (#1881)

* Reference LM api module

* upgrade lm api

* code review comments

* code review comments

* bump reconciler (#1886)

* chore(dependabot): bump sigs.k8s.io/kustomize/api from 0.15.0 to 0.16.0 (#1878)

Bumps [sigs.k8s.io/kustomize/api](https://github.com/kubernetes-sigs/kustomize) from 0.15.0 to 0.16.0.
- [Release notes](https://github.com/kubernetes-sigs/kustomize/releases)
- [Commits](kubernetes-sigs/kustomize@api/v0.15.0...api/v0.16.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/kustomize/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump helm.sh/helm/v3 from 3.13.2 to 3.13.3 (#1890)

Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.13.2 to 3.13.3.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.13.2...v3.13.3)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(dependabot): bump github.com/go-git/go-git/v5 (#1882)

Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) from 5.10.1 to 5.11.0.
- [Release notes](https://github.com/go-git/go-git/releases)
- [Commits](go-git/go-git@v5.10.1...v5.11.0)

---
updated-dependencies:
- dependency-name: github.com/go-git/go-git/v5
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(report): Adjusts the "Sprint Commits Test Suites" report to report E2E and Integration tests separately (#1891)

* Adjusts the "Sprint Commits Test Suites" report

* Fixes a typo

* Unify SemVer pkg usage (#1895)

* chore(dependabot): bump github.com/containerd/containerd (#1883)

Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.10 to 1.7.11.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](containerd/containerd@v1.7.10...v1.7.11)

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

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

* chore(dependabot): bump istio.io/client-go from 1.20.0 to 1.20.1 (#1884)

Bumps [istio.io/client-go](https://github.com/istio/client-go) from 1.20.0 to 1.20.1.
- [Commits](istio/client-go@1.20.0...1.20.1)

---
updated-dependencies:
- dependency-name: istio.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(dependabot): bump github.com/go-logr/logr from 1.3.0 to 1.4.1 (#1901)

Bumps [github.com/go-logr/logr](https://github.com/go-logr/logr) from 1.3.0 to 1.4.1.
- [Release notes](https://github.com/go-logr/logr/releases)
- [Changelog](https://github.com/go-logr/logr/blob/master/CHANGELOG.md)
- [Commits](go-logr/logr@v1.3.0...v1.4.1)

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

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

* chore(deps): bump the go_modules group across 1 directories with 1 update (#1899)

Bumps the go_modules group with 1 update in the /. directory: [github.com/cloudflare/circl](https://github.com/cloudflare/circl).


Updates `github.com/cloudflare/circl` from 1.3.6 to 1.3.7
- [Release notes](https://github.com/cloudflare/circl/releases)
- [Commits](cloudflare/circl@v1.3.6...v1.3.7)

---
updated-dependencies:
- dependency-name: github.com/cloudflare/circl
  dependency-type: indirect
  dependency-group: go_modules-security-group
...

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

* chore(dependabot): bump github.com/docker/go-connections (#1902)

Bumps [github.com/docker/go-connections](https://github.com/docker/go-connections) from 0.4.0 to 0.5.0.
- [Commits](docker/go-connections@v0.4.0...v0.5.0)

---
updated-dependencies:
- dependency-name: github.com/docker/go-connections
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump istio.io/client-go from 1.20.1 to 1.20.2 (#1903)

Bumps [istio.io/client-go](https://github.com/istio/client-go) from 1.20.1 to 1.20.2.
- [Commits](istio/client-go@1.20.1...1.20.2)

---
updated-dependencies:
- dependency-name: istio.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* chore(dependabot): bump k8s.io/klog/v2 from 2.110.1 to 2.120.0 (#1905)

Bumps [k8s.io/klog/v2](https://github.com/kubernetes/klog) from 2.110.1 to 2.120.0.
- [Release notes](https://github.com/kubernetes/klog/releases)
- [Changelog](https://github.com/kubernetes/klog/blob/main/RELEASE.md)
- [Commits](kubernetes/klog@v2.110.1...v2.120.0)

---
updated-dependencies:
- dependency-name: k8s.io/klog/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* Add mandatory documentation (#1904)

* chore(dependabot): bump github.com/onsi/ginkgo/v2 from 2.13.2 to 2.14.0 (#1910)

Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.13.2 to 2.14.0.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.13.2...v2.14.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump github.com/containerd/containerd (#1911)

Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.11 to 1.7.12.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](containerd/containerd@v1.7.11...v1.7.12)

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

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

* chore: Remove Module Validation from create module command (#1909)

* Remove module Validation

* Fix

* feat: Add Scaffold Command (#1859)

* feat: Add Scaffold Command

* feat: Add Docs

* feat: Add Docs

* docs(scaffold.go): Fix Long Description

* trigger build

* docs(scaffold.go): Update Md Files

* Update cmd/kyma/alpha/create/scaffold/scaffold.go

Co-authored-by: Małgorzata Świeca <[email protected]>

* Update cmd/kyma/alpha/create/scaffold/scaffold.go

Co-authored-by: Małgorzata Świeca <[email protected]>

* Update cmd/kyma/alpha/create/scaffold/scaffold.go

Co-authored-by: Małgorzata Świeca <[email protected]>

* Update docs/gen-docs/kyma_alpha_create.md

Co-authored-by: Małgorzata Świeca <[email protected]>

* Update cmd/kyma/alpha/create/scaffold/scaffold.go

Co-authored-by: Małgorzata Świeca <[email protected]>

* docs(scaffold.go): Update Md Files

* Merge Latest Changes

* Fix E2E Test

* scaffold.go: Fix Manifest and Default CR Generation

* default_cr.go: Fix Lint

* default_cr.go: Fix Metadata Case Sensitivity Issue

* scaffold.go: Fix Empty Directory Issue

* test-e2e-create-scaffold.yml: Add Newline At The End

* opts.go: Fix Overwrite Validation

* scaffold.go: Update Command Help

* Update Docs

* retrigger jobs

* Refactoring

* Refactoring

* Refactoring

* Refactoring

* Refactoring

* Refactoring

* Refactoring

* Refactoring

* Refactoring

* Add tests (WIP)

* Add tests (WIP)

* Add tests (WIP)

* Add tests (WIP)

* Add tests (WIP)

* Add tests (WIP)

* Add tests (WIP)

* Review fix

* Apply suggestions from code review

Co-authored-by: Oleksandr Meteiko <[email protected]>

* Review fix

* Review fix

* Review fix

* Review fix

* Review fix

* Review fix

* Review fix

* Review fix

---------

Co-authored-by: Małgorzata Świeca <[email protected]>
Co-authored-by: Benjamin Lindner <[email protected]>
Co-authored-by: Tomasz Smelcerz <[email protected]>
Co-authored-by: Oleksandr Meteiko <[email protected]>

* chore: Cleanup pre prow jobs (#1912)

* Add pull-cli-docs

* Add pull-cli-unit-test

* Add pull-cli-build

* new lines

* Empty-Commit

* feat: Set 1.27.9 as default K8s Version (#1913)

* Set 1.27.9 as default K8s Version

* Adapt docs

* feat: Add Support for Remote URLs in Module Config (#1906)

* feat: Add Support for Remote URLs in Module Config

* fix: Lint Issue

* fix: Data Race in test

* fix: Data Race in Test

* fix: Parallel Testing

* fix: PR Comments

* fix: HTTP mock in unit test

* fix: Lint Issue

* fix: Lint Issue

* fix: Fix Unrelated Unit Test

* Change to relative paths in generated scaffold module config (#1922)

* deps: Upgrade k8s to 1.29.1 (#1920)

* Upgrade k8s to 1.29.1

* fix build

---------

Co-authored-by: Badr, Nesma <[email protected]>

* chore(dependabot): bump helm.sh/helm/v3 from 3.13.3 to 3.14.0 (#1915)

Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.13.3 to 3.14.0.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.13.3...v3.14.0)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump sigs.k8s.io/controller-runtime (#1914)

Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.16.3 to 0.17.0.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.16.3...v0.17.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump github.com/onsi/ginkgo/v2 from 2.14.0 to 2.15.0 (#1925)

Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.14.0 to 2.15.0.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.14.0...v2.15.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* chore(dependabot): bump k8s.io/klog/v2 from 2.120.0 to 2.120.1 (#1926)

Bumps [k8s.io/klog/v2](https://github.com/kubernetes/klog) from 2.120.0 to 2.120.1.
- [Release notes](https://github.com/kubernetes/klog/releases)
- [Changelog](https://github.com/kubernetes/klog/blob/main/RELEASE.md)
- [Commits](kubernetes/klog@v2.120.0...v2.120.1)

---
updated-dependencies:
- dependency-name: k8s.io/klog/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Set default version to 2.20.0

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Xin Ruan <[email protected]>
Co-authored-by: Oleksandr Meteiko <[email protected]>
Co-authored-by: Tomasz Smelcerz <[email protected]>
Co-authored-by: Benjamin Lindner <[email protected]>
Co-authored-by: Nesma Badr <[email protected]>
Co-authored-by: Hukumraj Singh Deora <[email protected]>
Co-authored-by: Małgorzata Świeca <[email protected]>
Co-authored-by: Benjamin Lindner <[email protected]>
Co-authored-by: Badr, Nesma <[email protected]>
  • Loading branch information
11 people authored Jan 24, 2024
1 parent 10abcd8 commit 3f35a50
Show file tree
Hide file tree
Showing 47 changed files with 2,086 additions and 929 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/pull-cli-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: pull-cli-build
on:
pull_request:
branches:
- main
- 'release-**'
workflow_dispatch:
jobs:
cli-build:
name: build
runs-on: ubuntu-latest
steps:
- name: Checkout Kyma CLI
uses: actions/checkout@v3
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version-file: 'go.mod'
cache-dependency-path: 'go.sum'
- name: Run CLI Build
run: make build
21 changes: 21 additions & 0 deletions .github/workflows/pull-cli-docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: pull-cli-docs
on:
pull_request:
branches:
- main
- 'release-**'
workflow_dispatch:
jobs:
validate-docs:
name: docs validation
runs-on: ubuntu-latest
steps:
- name: Checkout Kyma CLI
uses: actions/checkout@v3
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version-file: 'go.mod'
cache-dependency-path: 'go.sum'
- name: Run Docs Validation
run: make validate
21 changes: 21 additions & 0 deletions .github/workflows/pull-cli-unit-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: pull-cli-unit-test
on:
pull_request:
branches:
- main
- 'release-**'
workflow_dispatch:
jobs:
unit-tests:
name: unit tests
runs-on: ubuntu-latest
steps:
- name: Checkout Kyma CLI
uses: actions/checkout@v3
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version-file: 'go.mod'
cache-dependency-path: 'go.sum'
- name: Run Unit Tests
run: make test
4 changes: 2 additions & 2 deletions .github/workflows/report-sprint-commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ jobs:
chmod a+x $reporter
python -m pip install --upgrade pip
pip install -r $pip_requirements
- name: Genarate a report
- name: Generate a report
run: |
$reporter --repo https://github.com/kyma-project/cli.git --days 14 --e2e-path tests/
$reporter --repo-url https://github.com/kyma-project/cli.git --days 14 --e2e tests/e2e
38 changes: 38 additions & 0 deletions .github/workflows/test-e2e-create-scaffold.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: TestSuite E2E. Scaffold Creation

on:
push:
branches:
- main
- 'release-**'
pull_request:
branches:
- main
- 'release-**'
paths:
- 'go.mod'
- 'go.sum'
- '**.go'
jobs:
e2e:
name: "Run E2E tests"
runs-on: ubuntu-latest
steps:
- name: Checkout Kyma CLI
uses: actions/checkout@v3
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version-file: 'go.mod'
cache-dependency-path: 'go.sum'
- name: Build Kyma CLI
run: |
make resolve validate build-linux
chmod +x ./bin/kyma-linux
ls -la ./bin
mv ./bin/kyma-linux /usr/local/bin/kyma
timeout-minutes: 10
- name: Run create scaffold test
run: |
make -C tests/e2e test-create-scaffold
timeout-minutes: 3
2 changes: 2 additions & 0 deletions cmd/kyma/alpha/create/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package create

import (
"github.com/kyma-project/cli/cmd/kyma/alpha/create/module"
"github.com/kyma-project/cli/cmd/kyma/alpha/create/scaffold"
"github.com/kyma-project/cli/internal/cli"
"github.com/spf13/cobra"
)
Expand All @@ -16,6 +17,7 @@ func NewCmd(o *cli.Options) *cobra.Command {
}

cmd.AddCommand(module.NewCmd(module.NewOptions(o)))
cmd.AddCommand(scaffold.NewCmd(scaffold.NewOptions(o)))

return cmd
}
73 changes: 33 additions & 40 deletions cmd/kyma/alpha/create/module/module.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package module

import (
"context"
"errors"
"fmt"
"maps"
Expand Down Expand Up @@ -30,14 +29,16 @@ import (

type command struct {
cli.Command
opts *Options
opts *Options
tmpFiles *module.TmpFilesManager
}

// NewCmd creates a new Kyma CLI command
func NewCmd(o *Options) *cobra.Command {
c := command{
Command: cli.Command{Options: o.Options},
opts: o,
Command: cli.Command{Options: o.Options},
opts: o,
tmpFiles: module.NewTmpFilesManager(),
}

cmd := &cobra.Command{
Expand Down Expand Up @@ -65,6 +66,7 @@ The module config file is a YAML file used to configure the following attributes
- name: a string, required, the name of the module
- version: a string, required, the version of the module
- channel: a string, required, channel that should be used in the ModuleTemplate CR
- mandatory: a boolean, optional, default=false, indicates whether the module is mandatory to be installed on all clusters
- manifest: a string, required, reference to the manifest, must be a relative file name
- defaultCR: a string, optional, reference to a YAML file containing the default CR for the module, must be a relative file name
- resourceName: a string, optional, default={NAME}-{CHANNEL}, the name for the ModuleTemplate CR that will be created
Expand Down Expand Up @@ -111,7 +113,7 @@ Build a Kubebuilder module my-domain/modC in version 3.2.1 and push it to a loca
kyma alpha create module --name my-domain/modC --version 3.2.1 --path /path/to/module --registry http://localhost:5001/unsigned --insecure
`,
RunE: func(cobraCmd *cobra.Command, args []string) error { return c.Run(cobraCmd.Context()) },
RunE: func(cobraCmd *cobra.Command, args []string) error { return c.Run() },
Aliases: []string{"mod"},
}

Expand Down Expand Up @@ -223,14 +225,9 @@ func configureLegacyFlags(cmd *cobra.Command, o *Options) *cobra.Command {
return cmd
}

type validator interface {
GetCrd() []byte
Run(ctx context.Context, log *zap.SugaredLogger) error
}

const kcpSystemNamespace = "kcp-system"

func (cmd *command) Run(ctx context.Context) error {
func (cmd *command) Run() error {
osFS := osfs.New()

if cmd.opts.CI {
Expand All @@ -253,6 +250,7 @@ func (cmd *command) Run(ctx context.Context) error {
}

modDef, modCnf, err := cmd.moduleDefinitionFromOptions()
defer cmd.tmpFiles.DeleteTmpFiles()

if err != nil {
return err
Expand All @@ -274,9 +272,9 @@ func (cmd *command) Run(ctx context.Context) error {
}
cmd.CurrentStep.Successf("Module built")

var crValidator validator
if crValidator, err = cmd.validateDefaultCR(ctx, modDef, l); err != nil {
return err
crd, err := module.GetCrdFromModuleDef(cmd.opts.KubebuilderProject, modDef)
if err != nil {
return nil
}

var archiveFS vfs.FileSystem
Expand Down Expand Up @@ -423,7 +421,7 @@ func (cmd *command) Run(ctx context.Context) error {
}

labels := cmd.getModuleTemplateLabels(modCnf)
annotations := cmd.getModuleTemplateAnnotations(modCnf, crValidator)
annotations := cmd.getModuleTemplateAnnotations(modCnf, crd)

template, err := module.Template(componentVersionAccess, resourceName, namespace,
channel, modDef.DefaultCR, labels, annotations, modDef.CustomStateChecks, mandatoryModule)
Expand Down Expand Up @@ -457,7 +455,7 @@ func (cmd *command) getModuleTemplateLabels(modCnf *Config) map[string]string {
return labels
}

func (cmd *command) getModuleTemplateAnnotations(modCnf *Config, crValidator validator) map[string]string {
func (cmd *command) getModuleTemplateAnnotations(modCnf *Config, crd []byte) map[string]string {
annotations := map[string]string{}
moduleVersion := cmd.opts.Version
if modCnf != nil {
Expand All @@ -466,7 +464,7 @@ func (cmd *command) getModuleTemplateAnnotations(modCnf *Config, crValidator val
moduleVersion = modCnf.Version
}

isClusterScoped := isCrdClusterScoped(crValidator.GetCrd())
isClusterScoped := isCrdClusterScoped(crd)
if isClusterScoped {
annotations[shared.IsClusterScopedAnnotation] = shared.EnableLabelValue
} else {
Expand All @@ -476,28 +474,6 @@ func (cmd *command) getModuleTemplateAnnotations(modCnf *Config, crValidator val
return annotations
}

func (cmd *command) validateDefaultCR(ctx context.Context, modDef *module.Definition, l *zap.SugaredLogger) (validator,
error) {
cmd.NewStep("Validating Default CR")

var crValidator validator
if cmd.opts.KubebuilderProject {
crValidator = module.NewDefaultCRValidator(modDef.DefaultCR, modDef.Source)
} else {
crValidator = module.NewSingleManifestFileCRValidator(modDef.DefaultCR, modDef.SingleManifestPath)
}

if err := crValidator.Run(ctx, l); err != nil {
if errors.Is(err, module.ErrEmptyCR) {
cmd.CurrentStep.Successf("Default CR validation skipped - no default CR")
return crValidator, nil
}
return crValidator, err
}
cmd.CurrentStep.Successf("Default CR validation succeeded")
return crValidator, nil
}

func (cmd *command) getRemote(nameMapping module.NameMapping) (*module.Remote, error) {
res := &module.Remote{
Registry: cmd.opts.RegistryURL,
Expand Down Expand Up @@ -567,13 +543,30 @@ func (cmd *command) moduleDefinitionFromOptions() (*module.Definition, *Config,

var defaultCRPath string
if moduleConfig.DefaultCRPath != "" {
isURL, defaultCRURL := module.ParseURL(moduleConfig.DefaultCRPath)
if isURL {
moduleConfig.DefaultCRPath, err = cmd.tmpFiles.DownloadRemoteFileToTmpFile(defaultCRURL.String(),
cmd.opts.Path, "kyma-module-default-cr-*.yaml")
if err != nil {
return nil, nil, fmt.Errorf("%w, %w", ErrDefaultCRFetch, err)
}
}
defaultCRPath, err = resolveFilePath(moduleConfig.DefaultCRPath, cmd.opts.Path)
if err != nil {
return nil, nil, fmt.Errorf("%w, %w", ErrDefaultCRPathValidation, err)
}
}

moduleManifestPath, err := resolveFilePath(moduleConfig.ManifestPath, cmd.opts.Path)
var moduleManifestPath string
isURL, manifestURL := module.ParseURL(moduleConfig.ManifestPath)
if isURL {
moduleConfig.ManifestPath, err = cmd.tmpFiles.DownloadRemoteFileToTmpFile(manifestURL.String(), cmd.opts.Path,
"kyma-module-manifest-*.yaml")
if err != nil {
return nil, nil, fmt.Errorf("%w, %w", ErrManifestFetch, err)
}
}
moduleManifestPath, err = resolveFilePath(moduleConfig.ManifestPath, cmd.opts.Path)
if err != nil {
return nil, nil, fmt.Errorf("%w, %w", ErrManifestPathValidation, err)
}
Expand Down
19 changes: 6 additions & 13 deletions cmd/kyma/alpha/create/module/module_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/kyma-project/lifecycle-manager/api/shared"

"github.com/kyma-project/cli/internal/cli"
"github.com/kyma-project/cli/pkg/module"
)

//go:embed testdata/clusterScopedCRD.yaml
Expand Down Expand Up @@ -120,8 +119,8 @@ func Test_command_getModuleTemplateAnnotations(t *testing.T) {
opts *Options
}
type args struct {
modCnf *Config
crValidator validator
modCnf *Config
crd []byte
}
tests := []struct {
name string
Expand All @@ -143,9 +142,7 @@ func Test_command_getModuleTemplateAnnotations(t *testing.T) {
},
Version: "1.1.1",
},
crValidator: &module.SingleManifestFileCRValidator{
Crd: namespacedScopedCrd,
},
crd: namespacedScopedCrd,
},
want: map[string]string{
"annotation1": "value1",
Expand All @@ -167,9 +164,7 @@ func Test_command_getModuleTemplateAnnotations(t *testing.T) {
},
Version: "1.1.1",
},
crValidator: &module.SingleManifestFileCRValidator{
Crd: clusterScopedCrd,
},
crd: clusterScopedCrd,
},
want: map[string]string{
"annotation1": "value1",
Expand All @@ -184,9 +179,7 @@ func Test_command_getModuleTemplateAnnotations(t *testing.T) {
opts: &Options{Version: "1.0.0"},
},
args: args{
crValidator: &module.SingleManifestFileCRValidator{
Crd: namespacedScopedCrd,
},
crd: namespacedScopedCrd,
},
want: map[string]string{
shared.ModuleVersionAnnotation: "1.0.0",
Expand All @@ -200,7 +193,7 @@ func Test_command_getModuleTemplateAnnotations(t *testing.T) {
Command: tt.fields.Command,
opts: tt.fields.opts,
}
if got := cmd.getModuleTemplateAnnotations(tt.args.modCnf, tt.args.crValidator); !reflect.DeepEqual(got,
if got := cmd.getModuleTemplateAnnotations(tt.args.modCnf, tt.args.crd); !reflect.DeepEqual(got,
tt.want) {
t.Errorf("getModuleTemplateAnnotations() = %v, want %v", got, tt.want)
}
Expand Down
Loading

0 comments on commit 3f35a50

Please sign in to comment.