Skip to content

Commit 5b748c1

Browse files
committed
Fix typos and update log retrieval in conformance tests
Corrected misspelled variable names and updated kubeconfig paths to align with the new naming conventions for ingress-controller logs. These changes ensure consistency across the codebase and improve the accuracy of log retrieval in GitHub Actions workflows.
1 parent 27b6bcb commit 5b748c1

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/workflows/conformance-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ jobs:
103103
- name: Get Logs from api7-ingress-controller
104104
shell: bash
105105
run: |
106-
export KUBECONFIG=/tmp/api7-ingress-cluster.kubeconfig
107-
kubectl logs -n api7ee-conformance-test -l app=api7-ingress-controller
106+
export KUBECONFIG=/tmp/apisix-ingress-cluster.kubeconfig
107+
kubectl logs -n apisix-conformance-test -l app=apisix-ingress-controller
108108
109109
- name: Upload Gateway API Conformance Report
110110
if: ${{ github.event_name == 'push' }}

internal/provider/adc/cache/memdb.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ package cache
1515
import (
1616
"errors"
1717

18+
"github.com/api7/gopkg/pkg/log"
1819
"github.com/hashicorp/go-memdb"
1920
"go.uber.org/zap"
2021

21-
"github.com/api7/gopkg/pkg/log"
22-
2322
types "github.com/api7/api7-ingress-controller/api/adc"
2423
)
2524

test/conformance/suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@ func TestMain(m *testing.M) {
130130
k8s.CreateNamespace(GinkgoT(), kubectl, namespace)
131131
defer k8s.DeleteNamespace(GinkgoT(), kubectl, namespace)
132132

133-
gatewayGouopId := f.CreateNewGatewayGroupWithIngress()
134-
adminKey := f.GetAdminKey(gatewayGouopId)
133+
gatewayGroupId := f.CreateNewGatewayGroupWithIngress()
134+
adminKey := f.GetAdminKey(gatewayGroupId)
135135

136136
svc := f.DeployGateway(framework.DataPlaneDeployOptions{
137137
Namespace: namespace,
138-
GatewayGroupID: gatewayGouopId,
138+
GatewayGroupID: gatewayGroupId,
139139
DPManagerEndpoint: framework.DPManagerTLSEndpoint,
140140
SetEnv: true,
141141
SSLKey: framework.TestKey,

0 commit comments

Comments
 (0)