Skip to content

OCPBUGS-42220: Infoblox - use 2.12.2 WAPI version #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2025
Merged

OCPBUGS-42220: Infoblox - use 2.12.2 WAPI version #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bundle/manifests/external-dns-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ metadata:
},
"gridHost": "100.100.100.100",
"wapiPort": 443,
"wapiVersion": "2.3.1"
"wapiVersion": "2.12.2"
},
"type": "Infoblox"
},
Expand Down Expand Up @@ -286,7 +286,7 @@ metadata:
},
"gridHost": "100.100.100.100",
"wapiPort": 443,
"wapiVersion": "2.3.1"
"wapiVersion": "2.12.2"
},
"type": "Infoblox"
},
Expand Down
2 changes: 1 addition & 1 deletion config/samples/infoblox/operator_v1alpha1_infoblox_detailed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
name: infoblox-credentials
gridHost: "100.100.100.100"
wapiPort: 443
wapiVersion: "2.3.1"
wapiVersion: "2.12.2"
# filter DNS zones
domains:
- filterType: Include
Expand Down
2 changes: 1 addition & 1 deletion config/samples/infoblox/operator_v1alpha1_infoblox_openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
name: infoblox-credentials
gridHost: "100.100.100.100"
wapiPort: 443
wapiVersion: "2.3.1"
wapiVersion: "2.12.2"
source:
# Source Type is route resource of OpenShift
type: OpenShiftRoute
Expand Down
2 changes: 1 addition & 1 deletion config/samples/infoblox/operator_v1beta1_infoblox_openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
name: infoblox-credentials
gridHost: "100.100.100.100"
wapiPort: 443
wapiVersion: "2.3.1"
wapiVersion: "2.12.2"
source:
# Source Type is route resource of OpenShift
type: OpenShiftRoute
Expand Down
2 changes: 1 addition & 1 deletion docs/infoblox-openshift.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ openshift-console downloads downloads-openshift-console.apps.
name: infoblox-credentials
gridHost: ${INFOBLOX_GRID_PUBLIC_IP}
wapiPort: 443
wapiVersion: "2.3.1"
wapiVersion: "2.12.2"
domains:
- filterType: Include
matchType: Exact
Expand Down
6 changes: 3 additions & 3 deletions pkg/operator/controller/externaldns/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1440,7 +1440,7 @@ func TestDesiredExternalDNSDeployment(t *testing.T) {
"--fqdn-template={{.Name}}.test.com",
"--infoblox-wapi-port=443",
"--infoblox-grid-host=gridhost.example.com",
"--infoblox-wapi-version=2.3.1",
"--infoblox-wapi-version=2.12.2",
"--txt-prefix=external-dns-",
},
Env: []corev1.EnvVar{
Expand Down Expand Up @@ -3179,7 +3179,7 @@ func TestDesiredExternalDNSDeployment(t *testing.T) {
`--fqdn-template={{""}}`,
"--infoblox-wapi-port=443",
"--infoblox-grid-host=gridhost.example.com",
"--infoblox-wapi-version=2.3.1",
"--infoblox-wapi-version=2.12.2",
"--txt-prefix=external-dns-",
},
Env: []corev1.EnvVar{
Expand Down Expand Up @@ -6727,7 +6727,7 @@ func testInfobloxExternalDNS(source operatorv1beta1.ExternalDNSSourceType) *oper
extdns.Spec.Provider.Infoblox = &operatorv1beta1.ExternalDNSInfobloxProviderOptions{
GridHost: "gridhost.example.com",
WAPIPort: 443,
WAPIVersion: "2.3.1",
WAPIVersion: "2.12.2",
}
return extdns
}
Expand Down
21 changes: 12 additions & 9 deletions test/e2e/infoblox.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,18 @@ const (
infobloxGridMasterHostnameEnvVar = "INFOBLOX_GRID_MASTER_HOSTNAME"
trustedCAConfigMapEnvVar = "TRUSTED_CA_CONFIGMAP_NAME"
defaultWAPIPort = "443"
defaultWAPIVersion = "2.3.1"
defaultTLSVerify = "false"
defaultHTTPRequestTimeout = 20
defaultHTTPConnPool = 10
defaultHostFilename = "host"
defaultUsernameFilename = "username"
defaultPasswordFilename = "password"
defaultMasterHostnameFilename = "masterhostname"
operatorContainerName = "operator"
// https://community.infoblox.com/cixhp49439/attachments/cixhp49439/IPAM/6153/2/NIOS_8.6.2_ReleaseNotesREVC.pdf
// Chapter: "Changes to Infoblox API and Restful API (WAPI)"
// "2.12.2" version is recommended for NIOS 8.6.2 (our Infoblox test instance is currently 8.6.4).
defaultWAPIVersion = "2.12.2"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this break compatibility with NIOS 7? We might need to add an API field to specify the WAPI version.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see that it is configurable:

external-dns-operator/api/v1beta1/externaldns_types.go

Lines 367 to 371 in 57a58f8

// WAPIVersion is the version of the Infoblox WAPI.
//
// +kubebuilder:validation:Required
// +required
WAPIVersion string `json:"wapiVersion"`

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this break compatibility with NIOS 7?

Not really, this is just the nominal version of the API we test our operator against. As you mentioned the user has to provide its version as a dedicated API field.

defaultTLSVerify = "false"
defaultHTTPRequestTimeout = 20
defaultHTTPConnPool = 10
defaultHostFilename = "host"
defaultUsernameFilename = "username"
defaultPasswordFilename = "password"
defaultMasterHostnameFilename = "masterhostname"
operatorContainerName = "operator"
)

type infobloxTestHelper struct {
Expand Down