Skip to content

Commit 4aafcf3

Browse files
Chaitanyareddy0702semmet95
authored andcommitted
feat: removes resource block
Signed-off-by: Amit Singh <[email protected]>
1 parent b74bf7c commit 4aafcf3

File tree

6 files changed

+5
-33
lines changed

6 files changed

+5
-33
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ env:
1313
# Common versions
1414
GO_VERSION: '1.23'
1515
GOLANGCI_VERSION: 'v1.56'
16-
KIND_VERSION: 'v0.27.0'
16+
KIND_VERSION: 'v0.29.0'
17+
K8S_VERSION: 'v1.31.9'
1718

1819
jobs:
1920

@@ -100,7 +101,7 @@ jobs:
100101
uses: helm/[email protected]
101102
with:
102103
version: ${{ env.KIND_VERSION }}
103-
node_image: kindest/node:v1.31.6
104+
node_image: kindest/node:${{ env.K8S_VERSION }}
104105
- name: Build Image
105106
run: |
106107
make image
@@ -145,7 +146,7 @@ jobs:
145146
uses: helm/[email protected]
146147
with:
147148
version: ${{ env.KIND_VERSION }}
148-
node_image: kindest/node:v1.31.6
149+
node_image: kindest/node:${{ env.K8S_VERSION }}
149150
- name: Prepare OCM testing environment
150151
run: |
151152
set -ex

charts/addon-manager/templates/addon-manager.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,5 @@ spec:
2020
- name: cluster-gateway-addon-manager
2121
image: {{ .Values.image }}:{{ .Values.tag | default (print "v" .Chart.Version) }}
2222
imagePullPolicy: IfNotPresent
23-
resources:
24-
requests:
25-
cpu: {{ .Values.resources.requests.cpu }}
26-
memory: {{ .Values.resources.requests.memory }}
27-
limits:
28-
cpu: {{ .Values.resources.limits.cpu }}
29-
memory: {{ .Values.resources.limits.memory }}
3023
args:
3124
- --leader-elect=true

charts/addon-manager/values.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
# Specs of cluster-gateway-addon-manager deployment
22
image: oamdev/cluster-gateway-addon-manager
3-
resources:
4-
requests:
5-
cpu: "250m"
6-
memory: "256Mi"
7-
limits:
8-
cpu: "500m"
9-
memory: "512Mi"
103

114
tag:
125

charts/cluster-gateway/templates/cluster-gateway-apiserver.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ spec:
2727
- name: gateway
2828
image: {{ .Values.image }}:{{ .Values.tag | default (print "v" .Chart.Version) }}
2929
imagePullPolicy: IfNotPresent
30-
resources:
31-
requests:
32-
cpu: {{ .Values.resources.requests.cpu }}
33-
memory: {{ .Values.resources.requests.memory }}
34-
limits:
35-
cpu: {{ .Values.resources.limits.cpu }}
36-
memory: {{ .Values.resources.limits.memory }}
3730
args:
3831
- --secure-port=9443
3932
- --secret-namespace={{ .Values.secretNamespace }}

charts/cluster-gateway/values.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
# Specs of gateway-deployment deployment
22
image: oamdev/cluster-gateway
3-
resources:
4-
requests:
5-
cpu: "250m"
6-
memory: "256Mi"
7-
limits:
8-
cpu: "500m"
9-
memory: "512Mi"
10-
113

124
tag:
135

e2e/ocm/clustergateway.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ var _ = Describe("Addon Manager Test", func() {
5454
gwHealthy := gw.Status.Healthy
5555
return addonHealthy && gwHealthy, nil
5656
}).
57-
WithTimeout(2 * time.Minute).
57+
WithTimeout(time.Minute).
5858
Should(BeTrue())
5959
})
6060
It("Manual probe healthiness should work",

0 commit comments

Comments
 (0)