From d5411cfa87b7c1eca7638cc873a87b0dd24374db Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Fri, 2 Jun 2023 14:22:44 -0400 Subject: [PATCH] Bump API for DNS config update --- go.mod | 2 +- go.sum | 4 ++-- ...g-operator_01_dns-TechPreviewNoUpgrade.crd.yaml | 2 +- .../api/config/v1/techpreview.dns.testsuite.yaml | 14 +++++++------- .../openshift/api/config/v1/types_dns.go | 2 +- vendor/modules.txt | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 5d8044e0d..ce5c10438 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/go-bindata/go-bindata v3.1.2+incompatible - github.com/openshift/api v0.0.0-20230602151412-aa5c60a389d7 + github.com/openshift/api v0.0.0-20230602160751-5c5196d9f4af github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb github.com/openshift/library-go v0.0.0-20230531082824-be85f8400975 diff --git a/go.sum b/go.sum index 268d3524b..5d70bec1e 100644 --- a/go.sum +++ b/go.sum @@ -419,8 +419,8 @@ github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= -github.com/openshift/api v0.0.0-20230602151412-aa5c60a389d7 h1:vOH0fxrs3mdf/TleaSnIh27uwWPuFhTCv7xqEp+nlJk= -github.com/openshift/api v0.0.0-20230602151412-aa5c60a389d7/go.mod h1:4VWG+W22wrB4HfBL88P40DxLEpSOaiBVxUnfalfJo9k= +github.com/openshift/api v0.0.0-20230602160751-5c5196d9f4af h1:d31ErBNJPDZkZcUjex+QiTKJLLyMcIhHUkER7CcURwU= +github.com/openshift/api v0.0.0-20230602160751-5c5196d9f4af/go.mod h1:4VWG+W22wrB4HfBL88P40DxLEpSOaiBVxUnfalfJo9k= github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR4ah7FfaPR1WePizm0jlrsbmPu91xQZnAsVVreQV1k= github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb h1:Nij5OnaECrkmcRQMAE9LMbQXPo95aqFnf+12B7SyFVI= diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns-TechPreviewNoUpgrade.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns-TechPreviewNoUpgrade.crd.yaml index cd56306ff..043b6fc60 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns-TechPreviewNoUpgrade.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns-TechPreviewNoUpgrade.crd.yaml @@ -53,7 +53,7 @@ spec: privateZoneIAMRole: description: privateZoneIAMRole contains the ARN of an IAM role that should be assumed when performing operations on the cluster's private hosted zone specified in the cluster DNS config. When left empty, no role should be assumed. type: string - pattern: ^arn:(aws|aws-cn|aws-us-gov):iam:[0-9]{12}:role\/.*$ + pattern: ^arn:(aws|aws-cn|aws-us-gov):iam::[0-9]{12}:role\/.*$ type: description: "type is the underlying infrastructure provider for the cluster. Allowed values: \"\", \"AWS\". \n Individual components may not support all platforms, and must handle unrecognized platforms with best-effort defaults." type: string diff --git a/vendor/github.com/openshift/api/config/v1/techpreview.dns.testsuite.yaml b/vendor/github.com/openshift/api/config/v1/techpreview.dns.testsuite.yaml index 358bef597..a63ff885d 100644 --- a/vendor/github.com/openshift/api/config/v1/techpreview.dns.testsuite.yaml +++ b/vendor/github.com/openshift/api/config/v1/techpreview.dns.testsuite.yaml @@ -20,7 +20,7 @@ tests: platform: type: AWS aws: - privateZoneIAMRole: arn:aws:iam:123456789012:role/foo + privateZoneIAMRole: arn:aws:iam::123456789012:role/foo expected: | apiVersion: config.openshift.io/v1 kind: DNS @@ -28,7 +28,7 @@ tests: platform: type: AWS aws: - privateZoneIAMRole: arn:aws:iam:123456789012:role/foo + privateZoneIAMRole: arn:aws:iam::123456789012:role/foo - name: Should not be able to specify unsupported platform initial: | apiVersion: config.openshift.io/v1 @@ -37,7 +37,7 @@ tests: platform: type: Azure azure: - privateZoneIAMRole: arn:aws:iam:123456789012:role/foo + privateZoneIAMRole: arn:aws:iam::123456789012:role/foo expectedError: "Invalid value: \"string\": allowed values are '' and 'AWS'" - name: Should not be able to specify invalid AWS role ARN initial: | @@ -50,7 +50,7 @@ tests: type: AWS aws: privateZoneIAMRole: arn:aws:iam:bad:123456789012:role/foo - expectedError: "DNS.config.openshift.io \"cluster\" is invalid: spec.platform.aws.privateZoneIAMRole: Invalid value: \"arn:aws:iam:bad:123456789012:role/foo\": spec.platform.aws.privateZoneIAMRole in body should match '^arn:(aws|aws-cn|aws-us-gov):iam:[0-9]{12}:role\\/.*$'" + expectedError: "DNS.config.openshift.io \"cluster\" is invalid: spec.platform.aws.privateZoneIAMRole: Invalid value: \"arn:aws:iam:bad:123456789012:role/foo\": spec.platform.aws.privateZoneIAMRole in body should match '^arn:(aws|aws-cn|aws-us-gov):iam::[0-9]{12}:role\\/.*$'" - name: Should not be able to specify different type and platform initial: | apiVersion: config.openshift.io/v1 @@ -59,7 +59,7 @@ tests: platform: type: "" aws: - privateZoneIAMRole: arn:aws:iam:123456789012:role/foo + privateZoneIAMRole: arn:aws:iam::123456789012:role/foo expectedError: "Invalid value: \"object\": aws configuration is required when platform is AWS, and forbidden otherwise" onUpdate: - name: Can switch from empty (default), to AWS @@ -76,7 +76,7 @@ tests: platform: type: AWS aws: - privateZoneIAMRole: arn:aws:iam:123456789012:role/foo + privateZoneIAMRole: arn:aws:iam::123456789012:role/foo expected: | apiVersion: config.openshift.io/v1 kind: DNS @@ -84,7 +84,7 @@ tests: platform: type: AWS aws: - privateZoneIAMRole: arn:aws:iam:123456789012:role/foo + privateZoneIAMRole: arn:aws:iam::123456789012:role/foo - name: Upgrade case is valid initial: | apiVersion: config.openshift.io/v1 diff --git a/vendor/github.com/openshift/api/config/v1/types_dns.go b/vendor/github.com/openshift/api/config/v1/types_dns.go index 89fb95950..afd241f9f 100644 --- a/vendor/github.com/openshift/api/config/v1/types_dns.go +++ b/vendor/github.com/openshift/api/config/v1/types_dns.go @@ -130,7 +130,7 @@ type AWSDNSSpec struct { // privateZoneIAMRole contains the ARN of an IAM role that should be assumed when performing // operations on the cluster's private hosted zone specified in the cluster DNS config. // When left empty, no role should be assumed. - // +kubebuilder:validation:Pattern:=`^arn:(aws|aws-cn|aws-us-gov):iam:[0-9]{12}:role\/.*$` + // +kubebuilder:validation:Pattern:=`^arn:(aws|aws-cn|aws-us-gov):iam::[0-9]{12}:role\/.*$` // +optional PrivateZoneIAMRole string `json:"privateZoneIAMRole"` } diff --git a/vendor/modules.txt b/vendor/modules.txt index e9f012ba6..fc162712e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -163,7 +163,7 @@ github.com/modern-go/reflect2 # github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 ## explicit github.com/munnerz/goautoneg -# github.com/openshift/api v0.0.0-20230602151412-aa5c60a389d7 +# github.com/openshift/api v0.0.0-20230602160751-5c5196d9f4af ## explicit; go 1.20 github.com/openshift/api github.com/openshift/api/apiserver