Skip to content

Commit 510d1c9

Browse files
pawan-59pawan-59
authored
Merge branch 'main' into YashasviDevtron-patch-1
2 parents 5ddd152 + 1574322 commit 510d1c9

File tree

732 files changed

+92905
-70152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

732 files changed

+92905
-70152
lines changed

‎.github/workflow/multi-gitter-pr-sync.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Creating PR using Multi-Gitter
2+
3+
on:
4+
pull_request:
5+
types: [opened]
6+
branches:
7+
- develop
8+
9+
jobs:
10+
update-dependencies:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout repository
14+
uses: actions/checkout@v2
15+
16+
- name: Set up Go
17+
uses: actions/setup-go@v4
18+
with:
19+
go-version: '>=1.17.0'
20+
21+
- name: Install multi-gitter
22+
run: curl -s https://raw.githubusercontent.com/lindell/multi-gitter/b62a2dfda0ed266502f7c71f7ce79f8fd9c26bf6/install.sh | sh
23+
24+
- name: Get PR details
25+
env:
26+
HEAD_BRANCH: ${{ github.event.pull_request.head.ref }}
27+
BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
28+
COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
29+
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
30+
PR_AUTHOR_ID: ${{ github.event.pull_request.user.id }}
31+
run: |
32+
echo "HEAD_BRANCH=$HEAD_BRANCH" >> $GITHUB_ENV
33+
echo "BASE_BRANCH=$BASE_BRANCH" >> $GITHUB_ENV
34+
echo "COMMIT_SHA=$COMMIT_SHA" >> $GITHUB_ENV
35+
echo "PR_AUTHOR=$PR_AUTHOR" >> $GITHUB_ENV
36+
echo "PR_AUTHOR_ID=$PR_AUTHOR_ID" >> $GITHUB_ENV
37+
echo "PR_AUTHOR_EMAIL=${PR_AUTHOR_ID}+${PR_AUTHOR}@users.noreply.github.com" >> $GITHUB_ENV
38+
39+
- name: Update script with PR details
40+
run: |
41+
sed -i 's/VERSION=.*/VERSION=${{ env.COMMIT_SHA }}/' .github/scripts/update-version.sh
42+
43+
- name: Run multi-gitter
44+
env:
45+
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
46+
run: |
47+
chmod +x .github/scripts/update-version.sh
48+
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

‎LICENSE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,3 +199,4 @@
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201201
limitations under the License.
202+

‎blob-storage/BlobStorageService.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ func (impl *BlobStorageServiceImpl) DeleteObjectForS3(request *BlobStorageReques
105105
return err
106106
}
107107
}
108-
109108
return nil
110109
}
111110

‎constants/constants.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,14 @@ const (
3838

3939
// metrics name constants
4040
const (
41-
NATS_PUBLISH_COUNT = "nats_publish_count"
42-
NATS_CONSUMPTION_COUNT = "nats_consumption_count"
43-
NATS_CONSUMING_COUNT = "nats_consuming_count"
44-
NATS_EVENT_CONSUMPTION_TIME = "nats_event_consumption_time"
45-
NATS_EVENT_PUBLISH_TIME = "nats_event_publish_time"
46-
NATS_EVENT_DELIVERY_COUNT = "nats_event_delivery_count"
47-
PANIC_RECOVERY_COUNT = "panic_recovery_count"
41+
NATS_PUBLISH_COUNT = "nats_publish_count"
42+
NATS_CONSUMPTION_COUNT = "nats_consumption_count"
43+
NATS_CONSUMING_COUNT = "nats_consuming_count"
44+
NATS_EVENT_CONSUMPTION_TIME = "nats_event_consumption_time"
45+
NATS_EVENT_PUBLISH_TIME = "nats_event_publish_time"
46+
NATS_EVENT_DELIVERY_COUNT = "nats_event_delivery_count"
47+
PANIC_RECOVERY_COUNT = "panic_recovery_count"
48+
REVERSE_PROXY_PANIC_RECOVERY_COUNT = "reverse_proxy_panic_recovery_count"
4849
)
4950

5051
// metrics labels constant

‎go.mod‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ require (
2626
google.golang.org/api v0.126.0
2727
gopkg.in/yaml.v2 v2.4.0
2828
helm.sh/helm/v3 v3.14.3
29-
k8s.io/api v0.29.0
30-
k8s.io/apimachinery v0.29.0
31-
k8s.io/client-go v0.29.0
29+
k8s.io/api v0.29.7
30+
k8s.io/apimachinery v0.29.7
31+
k8s.io/client-go v0.29.7
3232
k8s.io/kube-aggregator v0.0.0
3333
k8s.io/kubectl v0.29.0
34-
k8s.io/kubernetes v1.27.13
35-
k8s.io/metrics v0.24.2
34+
k8s.io/kubernetes v1.29.6
35+
k8s.io/metrics v0.29.7
3636
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
3737
sigs.k8s.io/yaml v1.3.0
3838
)
@@ -79,11 +79,10 @@ require (
7979
github.com/gogo/protobuf v1.3.2 // indirect
8080
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
8181
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
82-
github.com/google/gnostic v0.5.7-v3refs // indirect
8382
github.com/google/gnostic-models v0.6.8 // indirect
8483
github.com/google/go-cmp v0.6.0 // indirect
8584
github.com/google/gofuzz v1.2.0 // indirect
86-
github.com/google/s2a-go v0.1.4 // indirect
85+
github.com/google/s2a-go v0.1.7 // indirect
8786
github.com/google/uuid v1.3.0 // indirect
8887
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
8988
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
@@ -141,35 +140,35 @@ require (
141140
github.com/nats-io/nkeys v0.4.6 // indirect
142141
github.com/nats-io/nuid v1.0.1 // indirect
143142
go.uber.org/atomic v1.10.0 // indirect
144-
go.uber.org/multierr v1.6.0 // indirect
143+
go.uber.org/multierr v1.11.0 // indirect
145144
golang.org/x/crypto v0.25.0 // indirect
146145
google.golang.org/protobuf v1.33.0 // indirect
147146
)
148147

149148
replace (
150-
k8s.io/api => k8s.io/api v0.24.2
151-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.2
152-
k8s.io/apimachinery => k8s.io/apimachinery v0.24.2
153-
k8s.io/apiserver => k8s.io/apiserver v0.24.2
154-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.2
155-
k8s.io/client-go => k8s.io/client-go v0.24.2
156-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.2
157-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.2
158-
k8s.io/code-generator => k8s.io/code-generator v0.24.2
159-
k8s.io/component-base => k8s.io/component-base v0.24.2
160-
k8s.io/component-helpers => k8s.io/component-helpers v0.24.2
161-
k8s.io/controller-manager => k8s.io/controller-manager v0.24.2
162-
k8s.io/cri-api => k8s.io/cri-api v0.24.2
163-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.2
164-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.2
165-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.2
166-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.2
167-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.2
168-
k8s.io/kubectl => k8s.io/kubectl v0.24.2
169-
k8s.io/kubelet => k8s.io/kubelet v0.24.2
170-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.2
171-
k8s.io/metrics => k8s.io/metrics v0.24.2
172-
k8s.io/mount-utils => k8s.io/mount-utils v0.24.2
173-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.2
174-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.2
149+
k8s.io/api => k8s.io/api v0.29.7
150+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.7
151+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.7
152+
k8s.io/apiserver => k8s.io/apiserver v0.29.7
153+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.7
154+
k8s.io/client-go => k8s.io/client-go v0.29.7
155+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.7
156+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.7
157+
k8s.io/code-generator => k8s.io/code-generator v0.29.7
158+
k8s.io/component-base => k8s.io/component-base v0.29.7
159+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.7
160+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.7
161+
k8s.io/cri-api => k8s.io/cri-api v0.29.7
162+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.7
163+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.7
164+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.7
165+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.7
166+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.7
167+
k8s.io/kubectl => k8s.io/kubectl v0.29.7
168+
k8s.io/kubelet => k8s.io/kubelet v0.29.7
169+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.7
170+
k8s.io/metrics => k8s.io/metrics v0.29.7
171+
k8s.io/mount-utils => k8s.io/mount-utils v0.29.7
172+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7
173+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7
175174
)

0 commit comments

Comments
 (0)