Skip to content

Commit 393bd82

Browse files
authored
Bump osd-network-verifier to v1.7.0 and add AWS GovCloud support (#885)
* Bump osd-network-verifier to v1.7.0 and add AWS GovCloud support * Add AWS GovCloud support to network verifier - Add cloud.AWSGovCloudClassic to setupCloudProviderVerification switch - Add cloud.AWSGovCloudClassic to pod mode region setup - Update platform flag documentation to include aws-govcloud-classic - Regenerate command documentation This enables network verification for AWS GovCloud clusters in both regular and pod modes using osd-network-verifier v1.7.0.
1 parent a875df0 commit 393bd82

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

cmd/network/verification.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func NewCmdValidateEgress() *cobra.Command {
193193
validateEgressCmd.Flags().StringVar(&e.Region, "region", "", "(optional) AWS region, required for --pod-mode if not passing a --cluster-id")
194194
validateEgressCmd.Flags().BoolVar(&e.Debug, "debug", false, "(optional) if provided, enable additional debug-level logging")
195195
validateEgressCmd.Flags().BoolVarP(&e.AllSubnets, "all-subnets", "A", false, "(optional) an option for AWS Privatelink clusters to run osd-network-verifier against all subnets listed by ocm.")
196-
validateEgressCmd.Flags().StringVar(&e.platformName, "platform", "", "(optional) override for cloud platform/product. E.g., 'aws-classic' (OSD/ROSA Classic), 'aws-hcp' (ROSA HCP), or 'aws-hcp-zeroegress'")
196+
validateEgressCmd.Flags().StringVar(&e.platformName, "platform", "", "(optional) override for cloud platform/product. E.g., 'aws-classic' (OSD/ROSA Classic), 'aws-hcp' (ROSA HCP), 'aws-hcp-zeroegress', 'aws-govcloud-classic' (AWS GovCloud), or 'gcp-classic'")
197197
validateEgressCmd.Flags().DurationVar(&e.EgressTimeout, "egress-timeout", onv.DefaultTimeout, "(optional) timeout for individual egress verification requests")
198198
validateEgressCmd.Flags().BoolVar(&e.Version, "version", false, "When present, prints out the version of osd-network-verifier being used")
199199
validateEgressCmd.Flags().StringVar(&e.Probe, "probe", "curl", "(optional) select the probe to be used for egress testing. Either 'curl' (default) or 'legacy'")
@@ -789,7 +789,7 @@ func (e *EgressVerification) setupPodModeVerification(ctx context.Context, platf
789789
}
790790

791791
// For AWS-based platforms in pod mode, ensure region is set for proper egress list generation
792-
if platform == cloud.AWSClassic || platform == cloud.AWSHCP || platform == cloud.AWSHCPZeroEgress {
792+
if platform == cloud.AWSClassic || platform == cloud.AWSHCP || platform == cloud.AWSHCPZeroEgress || platform == cloud.AWSGovCloudClassic {
793793
var region string
794794

795795
// Try to detect region from OCM cluster info first
@@ -819,7 +819,7 @@ func (e *EgressVerification) setupPodModeVerification(ctx context.Context, platf
819819
// setupCloudProviderVerification sets up cloud provider-based verification and returns verifier and inputs
820820
func (e *EgressVerification) setupCloudProviderVerification(ctx context.Context, platform cloud.Platform) (networkVerifier, []*onv.ValidateEgressInput, error) {
821821
switch platform {
822-
case cloud.AWSHCP, cloud.AWSHCPZeroEgress, cloud.AWSClassic:
822+
case cloud.AWSHCP, cloud.AWSHCPZeroEgress, cloud.AWSClassic, cloud.AWSGovCloudClassic:
823823
cfg, err := e.setupForAws(ctx)
824824
if err != nil {
825825
return nil, nil, err

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3935,7 +3935,7 @@ osdctl network verify-egress [flags]
39353935
--namespace string (optional) Kubernetes namespace to run verification pods in (default "openshift-network-diagnostics")
39363936
--no-tls (optional) if provided, ignore all ssl certificate validations on client-side.
39373937
-o, --output string Valid formats are ['', 'json', 'yaml', 'env']
3938-
--platform string (optional) override for cloud platform/product. E.g., 'aws-classic' (OSD/ROSA Classic), 'aws-hcp' (ROSA HCP), or 'aws-hcp-zeroegress'
3938+
--platform string (optional) override for cloud platform/product. E.g., 'aws-classic' (OSD/ROSA Classic), 'aws-hcp' (ROSA HCP), 'aws-hcp-zeroegress', 'aws-govcloud-classic' (AWS GovCloud), or 'gcp-classic'
39393939
--pod-mode (optional) run verification using Kubernetes pods instead of cloud instances
39403940
--probe string (optional) select the probe to be used for egress testing. Either 'curl' (default) or 'legacy' (default "curl")
39413941
--region string (optional) AWS region, required for --pod-mode if not passing a --cluster-id

docs/osdctl_network_verify-egress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ osdctl network verify-egress [flags]
9191
--kubeconfig string (optional) path to kubeconfig file for pod mode (uses default kubeconfig if not specified)
9292
--namespace string (optional) Kubernetes namespace to run verification pods in (default "openshift-network-diagnostics")
9393
--no-tls (optional) if provided, ignore all ssl certificate validations on client-side.
94-
--platform string (optional) override for cloud platform/product. E.g., 'aws-classic' (OSD/ROSA Classic), 'aws-hcp' (ROSA HCP), or 'aws-hcp-zeroegress'
94+
--platform string (optional) override for cloud platform/product. E.g., 'aws-classic' (OSD/ROSA Classic), 'aws-hcp' (ROSA HCP), 'aws-hcp-zeroegress', 'aws-govcloud-classic' (AWS GovCloud), or 'gcp-classic'
9595
--pod-mode (optional) run verification using Kubernetes pods instead of cloud instances
9696
--probe string (optional) select the probe to be used for egress testing. Either 'curl' (default) or 'legacy' (default "curl")
9797
--region string (optional) AWS region, required for --pod-mode if not passing a --cluster-id

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ require (
4949
github.com/openshift/hive/apis v0.0.0-20250206153200-5a34ea42e678
5050
github.com/openshift/hypershift/api v0.0.0-20250208145556-2753dcc8cfb7
5151
github.com/openshift/ocm-container v1.0.1-0.20260310005051-28d4fda21872
52-
github.com/openshift/osd-network-verifier v1.6.1
52+
github.com/openshift/osd-network-verifier v1.7.0
5353
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
5454
github.com/shopspring/decimal v1.4.0
5555
github.com/sirupsen/logrus v1.9.4

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,8 @@ github.com/openshift/hypershift/api v0.0.0-20250208145556-2753dcc8cfb7 h1:535PgO
492492
github.com/openshift/hypershift/api v0.0.0-20250208145556-2753dcc8cfb7/go.mod h1:fQFj8aH3buOKqmhMQ5igRVOT7iQdduxRE9H1LM/BiY0=
493493
github.com/openshift/ocm-container v1.0.1-0.20260310005051-28d4fda21872 h1:ctMZePpayeWKIrW7e+4B5/nW9PABo1xrwiVf8IR5eCQ=
494494
github.com/openshift/ocm-container v1.0.1-0.20260310005051-28d4fda21872/go.mod h1:9BnOM0uw0vl/liK1fLSDebncPDBTOEJv2E+mi70MFbQ=
495-
github.com/openshift/osd-network-verifier v1.6.1 h1:3Qtlo24bgKNxNdhoYXWjc/UvtCL1k5kULa6lPsO93gg=
496-
github.com/openshift/osd-network-verifier v1.6.1/go.mod h1:WBsoc9YeIdm3ZtWPad+j20qxkgBDrRK2Kiu4N/MeenE=
495+
github.com/openshift/osd-network-verifier v1.7.0 h1:uYIA1Tk9y350QaIJXm/luXIwN/Gp5/sBtceHaeGUWn8=
496+
github.com/openshift/osd-network-verifier v1.7.0/go.mod h1:WBsoc9YeIdm3ZtWPad+j20qxkgBDrRK2Kiu4N/MeenE=
497497
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
498498
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
499499
github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=

0 commit comments

Comments
 (0)