Skip to content

Commit

Permalink
Merge pull request #34 from devtron-labs/unused-dependency
Browse files Browse the repository at this point in the history
chore: removed unwanted dependency
  • Loading branch information
vikramdevtron authored Nov 5, 2024
2 parents b4888f5 + 13c6a0a commit 73ce53e
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 20 deletions.
3 changes: 1 addition & 2 deletions chart-sync/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ docker-build-push: docker-build-image
docker push ${REGISTRY}/chart-sync:${TAG}

dep-update-oss:
go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) \
-replace=github.com/devtron-labs/chart-sync=github.com/devtron-labs/devtron-services/chart-sync@$(TARGET_BRANCH)
go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH)
go mod tidy
go mod vendor
4 changes: 1 addition & 3 deletions chart-sync/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,4 @@ require (
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/devtron-labs/chart-sync => github.com/devtron-labs/devtron-services/chart-sync v0.0.0-20241024131256-7d3ba621dece
)
3 changes: 1 addition & 2 deletions ci-runner/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ docker-build-push: docker-build-image


dep-update-oss:
go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) \
-replace=github.com/devtron-labs/ci-runner=github.com/devtron-labs/devtron-services/ci-runner@$(TARGET_BRANCH)
go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH)
go mod tidy
go mod vendor
4 changes: 1 addition & 3 deletions ci-runner/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,4 @@ require (
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/devtron-labs/ci-runner => github.com/devtron-labs/devtron-services/ci-runner v0.0.0-20241024131256-7d3ba621dece
)
3 changes: 1 addition & 2 deletions git-sensor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ run: build
# docker push ${REGISTRY}/orchestrator:${TAG}

dep-update-oss:
go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) \
-replace=github.com/devtron-labs/git-sensor=github.com/devtron-labs/devtron-services/git-sensor@$(TARGET_BRANCH)
go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH)
go mod tidy
go mod vendor

Expand Down
4 changes: 1 addition & 3 deletions git-sensor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,4 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
mellium.im/sasl v0.3.1 // indirect
)

replace github.com/devtron-labs/git-sensor => github.com/devtron-labs/devtron-services/git-sensor v0.0.0-20241024131256-7d3ba621dece
)
3 changes: 1 addition & 2 deletions kubelink/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ run: build
./kubelink

dep-update-oss:
go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) \
-replace=github.com/devtron-labs/kubelink=github.com/devtron-labs/devtron-services/kubelink@$(TARGET_BRANCH)
go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH)
go mod tidy
go mod vendor

4 changes: 1 addition & 3 deletions kubelink/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,4 @@ replace (
k8s.io/mount-utils => k8s.io/mount-utils v0.25.0
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.0
)

replace github.com/devtron-labs/kubelink => github.com/devtron-labs/devtron-services/kubelink v0.0.0-20241024131256-7d3ba621dece
)

0 comments on commit 73ce53e

Please sign in to comment.