Skip to content

Commit

Permalink
Merge branch 'main' into YashasviDevtron-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
@pawan-59
pawan-59 authored Oct 3, 2024
2 parents 5ddd152 + 1574322 commit 510d1c9
Show file tree
Hide file tree
Showing 732 changed files with 92,905 additions and 70,152 deletions.
48 changes: 48 additions & 0 deletions .github/workflow/multi-gitter-pr-sync.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Creating PR using Multi-Gitter

on:
pull_request:
types: [opened]
branches:
- develop

jobs:
update-dependencies:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '>=1.17.0'

- name: Install multi-gitter
run: curl -s https://raw.githubusercontent.com/lindell/multi-gitter/b62a2dfda0ed266502f7c71f7ce79f8fd9c26bf6/install.sh | sh

- name: Get PR details
env:
HEAD_BRANCH: ${{ github.event.pull_request.head.ref }}
BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
PR_AUTHOR_ID: ${{ github.event.pull_request.user.id }}
run: |
echo "HEAD_BRANCH=$HEAD_BRANCH" >> $GITHUB_ENV
echo "BASE_BRANCH=$BASE_BRANCH" >> $GITHUB_ENV
echo "COMMIT_SHA=$COMMIT_SHA" >> $GITHUB_ENV
echo "PR_AUTHOR=$PR_AUTHOR" >> $GITHUB_ENV
echo "PR_AUTHOR_ID=$PR_AUTHOR_ID" >> $GITHUB_ENV
echo "PR_AUTHOR_EMAIL=${PR_AUTHOR_ID}+${PR_AUTHOR}@users.noreply.github.com" >> $GITHUB_ENV
- name: Update script with PR details
run: |
sed -i 's/VERSION=.*/VERSION=${{ env.COMMIT_SHA }}/' .github/scripts/update-version.sh
- name: Run multi-gitter
env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: |
chmod +x .github/scripts/update-version.sh
multi-gitter run .github/scripts/update-version.sh --token "$GITEA_TOKEN" --base-branch "$BASE_BRANCH" --branch "$HEAD_BRANCH" --author-name "$PR_AUTHOR" --author-email "$PR_AUTHOR_EMAIL" --pr-title "fix: sync with changes from $HEAD_BRANCH of common-lib" --config .github/config/multi-gitter-config
1 change: 1 addition & 0 deletions LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,4 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

1 change: 0 additions & 1 deletion blob-storage/BlobStorageService.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ func (impl *BlobStorageServiceImpl) DeleteObjectForS3(request *BlobStorageReques
return err
}
}

return nil
}

Expand Down
15 changes: 8 additions & 7 deletions constants/constants.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ const (

// metrics name constants
const (
NATS_PUBLISH_COUNT = "nats_publish_count"
NATS_CONSUMPTION_COUNT = "nats_consumption_count"
NATS_CONSUMING_COUNT = "nats_consuming_count"
NATS_EVENT_CONSUMPTION_TIME = "nats_event_consumption_time"
NATS_EVENT_PUBLISH_TIME = "nats_event_publish_time"
NATS_EVENT_DELIVERY_COUNT = "nats_event_delivery_count"
PANIC_RECOVERY_COUNT = "panic_recovery_count"
NATS_PUBLISH_COUNT = "nats_publish_count"
NATS_CONSUMPTION_COUNT = "nats_consumption_count"
NATS_CONSUMING_COUNT = "nats_consuming_count"
NATS_EVENT_CONSUMPTION_TIME = "nats_event_consumption_time"
NATS_EVENT_PUBLISH_TIME = "nats_event_publish_time"
NATS_EVENT_DELIVERY_COUNT = "nats_event_delivery_count"
PANIC_RECOVERY_COUNT = "panic_recovery_count"
REVERSE_PROXY_PANIC_RECOVERY_COUNT = "reverse_proxy_panic_recovery_count"
)

// metrics labels constant
Expand Down
65 changes: 32 additions & 33 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ require (
google.golang.org/api v0.126.0
gopkg.in/yaml.v2 v2.4.0
helm.sh/helm/v3 v3.14.3
k8s.io/api v0.29.0
k8s.io/apimachinery v0.29.0
k8s.io/client-go v0.29.0
k8s.io/api v0.29.7
k8s.io/apimachinery v0.29.7
k8s.io/client-go v0.29.7
k8s.io/kube-aggregator v0.0.0
k8s.io/kubectl v0.29.0
k8s.io/kubernetes v1.27.13
k8s.io/metrics v0.24.2
k8s.io/kubernetes v1.29.6
k8s.io/metrics v0.29.7
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/yaml v1.3.0
)
Expand Down Expand Up @@ -79,11 +79,10 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
Expand Down Expand Up @@ -141,35 +140,35 @@ require (
github.com/nats-io/nkeys v0.4.6 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.24.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.2
k8s.io/apimachinery => k8s.io/apimachinery v0.24.2
k8s.io/apiserver => k8s.io/apiserver v0.24.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.2
k8s.io/client-go => k8s.io/client-go v0.24.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.2
k8s.io/code-generator => k8s.io/code-generator v0.24.2
k8s.io/component-base => k8s.io/component-base v0.24.2
k8s.io/component-helpers => k8s.io/component-helpers v0.24.2
k8s.io/controller-manager => k8s.io/controller-manager v0.24.2
k8s.io/cri-api => k8s.io/cri-api v0.24.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.2
k8s.io/kubectl => k8s.io/kubectl v0.24.2
k8s.io/kubelet => k8s.io/kubelet v0.24.2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.2
k8s.io/metrics => k8s.io/metrics v0.24.2
k8s.io/mount-utils => k8s.io/mount-utils v0.24.2
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.2
k8s.io/api => k8s.io/api v0.29.7
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.7
k8s.io/apimachinery => k8s.io/apimachinery v0.29.7
k8s.io/apiserver => k8s.io/apiserver v0.29.7
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.7
k8s.io/client-go => k8s.io/client-go v0.29.7
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.7
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.7
k8s.io/code-generator => k8s.io/code-generator v0.29.7
k8s.io/component-base => k8s.io/component-base v0.29.7
k8s.io/component-helpers => k8s.io/component-helpers v0.29.7
k8s.io/controller-manager => k8s.io/controller-manager v0.29.7
k8s.io/cri-api => k8s.io/cri-api v0.29.7
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.7
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.7
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.7
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.7
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.7
k8s.io/kubectl => k8s.io/kubectl v0.29.7
k8s.io/kubelet => k8s.io/kubelet v0.29.7
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.7
k8s.io/metrics => k8s.io/metrics v0.29.7
k8s.io/mount-utils => k8s.io/mount-utils v0.29.7
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7
)
Loading

0 comments on commit 510d1c9

Please sign in to comment.