Skip to content

Commit 22b09d1

Browse files
feat: removing e2e test changes for konnector agent
1 parent 4b89c28 commit 22b09d1

File tree

10 files changed

+7
-299
lines changed

10 files changed

+7
-299
lines changed

.github/workflows/e2e.yml

Lines changed: 1 addition & 258 deletions
Large diffs are not rendered by default.

examples/capi-quick-start/nutanix-cluster-calico-crs.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ spec:
100100
strategy: HelmAddon
101101
snapshotController:
102102
strategy: HelmAddon
103-
konnectorAgent:
104-
credentials:
105-
secretRef:
106-
name: ${CLUSTER_NAME}-pc-creds-for-konnector-agent
107103
nfd:
108104
strategy: ClusterResourceSet
109105
serviceLoadBalancer:

examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,6 @@ spec:
9898
strategy: HelmAddon
9999
snapshotController:
100100
strategy: HelmAddon
101-
konnectorAgent:
102-
credentials:
103-
secretRef:
104-
name: ${CLUSTER_NAME}-pc-creds-for-konnector-agent
105101
nfd: {}
106102
serviceLoadBalancer:
107103
configuration:

examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ spec:
100100
strategy: HelmAddon
101101
snapshotController:
102102
strategy: HelmAddon
103-
konnectorAgent:
104-
credentials:
105-
secretRef:
106-
name: ${CLUSTER_NAME}-pc-creds-for-konnector-agent
107103
nfd:
108104
strategy: ClusterResourceSet
109105
serviceLoadBalancer:

examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,6 @@ spec:
9898
strategy: HelmAddon
9999
snapshotController:
100100
strategy: HelmAddon
101-
konnectorAgent:
102-
credentials:
103-
secretRef:
104-
name: ${CLUSTER_NAME}-pc-creds-for-konnector-agent
105101
nfd: {}
106102
serviceLoadBalancer:
107103
configuration:

examples/capi-quick-start/nutanix-cluster-with-failuredomains-cilium-crs.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,6 @@ spec:
136136
strategy: HelmAddon
137137
snapshotController:
138138
strategy: HelmAddon
139-
konnectorAgent:
140-
credentials:
141-
secretRef:
142-
name: ${CLUSTER_NAME}-pc-creds-for-konnector-agent
143139
nfd:
144140
strategy: ClusterResourceSet
145141
serviceLoadBalancer:

examples/capi-quick-start/nutanix-cluster-with-failuredomains-cilium-helm-addon.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,6 @@ spec:
134134
strategy: HelmAddon
135135
snapshotController:
136136
strategy: HelmAddon
137-
konnectorAgent:
138-
credentials:
139-
secretRef:
140-
name: ${CLUSTER_NAME}-pc-creds-for-konnector-agent
141137
nfd: {}
142138
serviceLoadBalancer:
143139
configuration:

hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ patches:
3434
- target:
3535
kind: Cluster
3636
path: ../../../patches/nutanix/cosi.yaml
37-
- target:
38-
kind: Cluster
39-
path: ../../../patches/nutanix/konnector-agent.yaml
37+
#- target:
38+
# kind: Cluster
39+
# path: ../../../patches/nutanix/konnector-agent.yaml
4040
- target:
4141
kind: Cluster
4242
path: ../../../patches/nutanix/ccm.yaml

test/e2e/addon_helpers.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,4 @@ func WaitForAddonsToBeReadyInWorkloadCluster(
141141
HelmReleaseIntervals: input.HelmReleaseIntervals,
142142
},
143143
)
144-
145-
WaitForKonnectorAgentToBeReadyInWorkloadCluster(
146-
ctx,
147-
WaitForKonnectorAgentToBeReadyInWorkloadClusterInput{
148-
KonnectorAgent: input.AddonsConfig.NutanixKonnectorAgent,
149-
WorkloadCluster: input.WorkloadCluster,
150-
ClusterProxy: input.ClusterProxy,
151-
DeploymentIntervals: input.DeploymentIntervals,
152-
HelmReleaseIntervals: input.HelmReleaseIntervals,
153-
},
154-
)
155144
}

test/e2e/config/caren.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ providers:
140140
versions:
141141
# Upgrade e2e tests will use this as the "upgrade from" version.
142142
# This should reference the most recent successful release.
143-
- name: "{go://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix@v0.35}"
144-
value: "https://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/releases/download/{go://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix@v0.35}/runtime-extensions-components.yaml"
143+
- name: "{go://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix@v0.34}"
144+
value: "https://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/releases/download/{go://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix@v0.34}/runtime-extensions-components.yaml"
145145
type: "url"
146146
contract: v1beta1
147147
files:
@@ -151,7 +151,7 @@ providers:
151151
new: "--v=8"
152152
- old: --metrics-addr=127.0.0.1:8080
153153
new: --metrics-addr=:8080
154-
- name: v0.37.99 # "vNext"; use manifests from local source files
154+
- name: v0.36.99 # "vNext"; use manifests from local source files
155155
value: "file://../../../runtime-extensions-components.yaml"
156156
type: "url"
157157
contract: v1beta1

0 commit comments

Comments
 (0)