Skip to content

Commit 57a58f8

Browse files
committed
OCPBUGS-42220: Infoblox - use 2.12.2 WAPI version
The test NIOS instance has been upgraded to 8.6.4 which recommends 2.12.2 as the WAPI version. This commit updates the e2e test and docs with the recommended WAPI version. Ref: https://community.infoblox.com/cixhp49439/attachments/cixhp49439/IPAM/6153/2/NIOS_8.6.2_ReleaseNotesREVC.pdf
1 parent ace229b commit 57a58f8

7 files changed

+21
-18
lines changed

bundle/manifests/external-dns-operator.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ metadata:
139139
},
140140
"gridHost": "100.100.100.100",
141141
"wapiPort": 443,
142-
"wapiVersion": "2.3.1"
142+
"wapiVersion": "2.12.2"
143143
},
144144
"type": "Infoblox"
145145
},
@@ -286,7 +286,7 @@ metadata:
286286
},
287287
"gridHost": "100.100.100.100",
288288
"wapiPort": 443,
289-
"wapiVersion": "2.3.1"
289+
"wapiVersion": "2.12.2"
290290
},
291291
"type": "Infoblox"
292292
},

config/samples/infoblox/operator_v1alpha1_infoblox_detailed.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
name: infoblox-credentials
1212
gridHost: "100.100.100.100"
1313
wapiPort: 443
14-
wapiVersion: "2.3.1"
14+
wapiVersion: "2.12.2"
1515
# filter DNS zones
1616
domains:
1717
- filterType: Include

config/samples/infoblox/operator_v1alpha1_infoblox_openshift.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
name: infoblox-credentials
1515
gridHost: "100.100.100.100"
1616
wapiPort: 443
17-
wapiVersion: "2.3.1"
17+
wapiVersion: "2.12.2"
1818
source:
1919
# Source Type is route resource of OpenShift
2020
type: OpenShiftRoute

config/samples/infoblox/operator_v1beta1_infoblox_openshift.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
name: infoblox-credentials
1515
gridHost: "100.100.100.100"
1616
wapiPort: 443
17-
wapiVersion: "2.3.1"
17+
wapiVersion: "2.12.2"
1818
source:
1919
# Source Type is route resource of OpenShift
2020
type: OpenShiftRoute

docs/infoblox-openshift.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ openshift-console downloads downloads-openshift-console.apps.
5050
name: infoblox-credentials
5151
gridHost: ${INFOBLOX_GRID_PUBLIC_IP}
5252
wapiPort: 443
53-
wapiVersion: "2.3.1"
53+
wapiVersion: "2.12.2"
5454
domains:
5555
- filterType: Include
5656
matchType: Exact

pkg/operator/controller/externaldns/deployment_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,7 @@ func TestDesiredExternalDNSDeployment(t *testing.T) {
14401440
"--fqdn-template={{.Name}}.test.com",
14411441
"--infoblox-wapi-port=443",
14421442
"--infoblox-grid-host=gridhost.example.com",
1443-
"--infoblox-wapi-version=2.3.1",
1443+
"--infoblox-wapi-version=2.12.2",
14441444
"--txt-prefix=external-dns-",
14451445
},
14461446
Env: []corev1.EnvVar{
@@ -3179,7 +3179,7 @@ func TestDesiredExternalDNSDeployment(t *testing.T) {
31793179
`--fqdn-template={{""}}`,
31803180
"--infoblox-wapi-port=443",
31813181
"--infoblox-grid-host=gridhost.example.com",
3182-
"--infoblox-wapi-version=2.3.1",
3182+
"--infoblox-wapi-version=2.12.2",
31833183
"--txt-prefix=external-dns-",
31843184
},
31853185
Env: []corev1.EnvVar{
@@ -6727,7 +6727,7 @@ func testInfobloxExternalDNS(source operatorv1beta1.ExternalDNSSourceType) *oper
67276727
extdns.Spec.Provider.Infoblox = &operatorv1beta1.ExternalDNSInfobloxProviderOptions{
67286728
GridHost: "gridhost.example.com",
67296729
WAPIPort: 443,
6730-
WAPIVersion: "2.3.1",
6730+
WAPIVersion: "2.12.2",
67316731
}
67326732
return extdns
67336733
}

test/e2e/infoblox.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,18 @@ const (
3535
infobloxGridMasterHostnameEnvVar = "INFOBLOX_GRID_MASTER_HOSTNAME"
3636
trustedCAConfigMapEnvVar = "TRUSTED_CA_CONFIGMAP_NAME"
3737
defaultWAPIPort = "443"
38-
defaultWAPIVersion = "2.3.1"
39-
defaultTLSVerify = "false"
40-
defaultHTTPRequestTimeout = 20
41-
defaultHTTPConnPool = 10
42-
defaultHostFilename = "host"
43-
defaultUsernameFilename = "username"
44-
defaultPasswordFilename = "password"
45-
defaultMasterHostnameFilename = "masterhostname"
46-
operatorContainerName = "operator"
38+
// https://community.infoblox.com/cixhp49439/attachments/cixhp49439/IPAM/6153/2/NIOS_8.6.2_ReleaseNotesREVC.pdf
39+
// Chapter: "Changes to Infoblox API and Restful API (WAPI)"
40+
// "2.12.2" version is recommended for NIOS 8.6.2 (our Infoblox test instance is currently 8.6.4).
41+
defaultWAPIVersion = "2.12.2"
42+
defaultTLSVerify = "false"
43+
defaultHTTPRequestTimeout = 20
44+
defaultHTTPConnPool = 10
45+
defaultHostFilename = "host"
46+
defaultUsernameFilename = "username"
47+
defaultPasswordFilename = "password"
48+
defaultMasterHostnameFilename = "masterhostname"
49+
operatorContainerName = "operator"
4750
)
4851

4952
type infobloxTestHelper struct {

0 commit comments

Comments
 (0)