diff --git a/cmd/ingress-operator/start.go b/cmd/ingress-operator/start.go index f46052e45..db91c73ea 100644 --- a/cmd/ingress-operator/start.go +++ b/cmd/ingress-operator/start.go @@ -35,8 +35,8 @@ const ( defaultTrustedCABundle = "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" defaultGatewayAPIOperatorCatalog = "redhat-operators" defaultGatewayAPIOperatorChannel = "stable" - defaultGatewayAPIOperatorVersion = "servicemeshoperator3.v3.3.0" - defaultIstioVersion = "v1.28.4" + defaultGatewayAPIOperatorVersion = "servicemeshoperator3.v3.3.1" + defaultIstioVersion = "v1.28.5" ) type StartOptions struct { diff --git a/hack/gatewayapi-conformance.sh b/hack/gatewayapi-conformance.sh index 82810bcaf..f7be088dc 100755 --- a/hack/gatewayapi-conformance.sh +++ b/hack/gatewayapi-conformance.sh @@ -59,8 +59,9 @@ go mod vendor sed -i -e '/MaxTimeToConsistency:/ s/30/360/' conformance/utils/config/timeout.go SUPPORTED_FEATURES="BackendTLSPolicy,BackendTLSPolicySANValidation,GRPCRoute,Gateway,GatewayAddressEmpty,GatewayHTTPListenerIsolation,GatewayInfrastructurePropagation,GatewayPort8080,HTTPRoute,HTTPRouteBackendProtocolH2C,HTTPRouteBackendProtocolWebSocket,HTTPRouteBackendRequestHeaderModification,HTTPRouteBackendTimeout,HTTPRouteCORS,HTTPRouteDestinationPortMatching,HTTPRouteHostRewrite,HTTPRouteMethodMatching,HTTPRouteNamedRouteRule,HTTPRouteParentRefPort,HTTPRoutePathRedirect,HTTPRoutePathRewrite,HTTPRoutePortRedirect,HTTPRouteQueryParamMatching,HTTPRouteRequestMirror,HTTPRouteRequestMultipleMirrors,HTTPRouteRequestPercentageMirror,HTTPRouteRequestTimeout,HTTPRouteResponseHeaderModification,HTTPRouteSchemeRedirect,ReferenceGrant" +# skipping BackendTLSPolicyConflictResolution confornance test because upstream istio is not supporting this at the moment: https://github.com/istio/istio/blob/ba49f7398a8542c3612788e9bd0371c079e44165/tests/integration/pilot/gateway_conformance_test.go#L67 SKIPPED_TESTS="HTTPRouteCORSAllowCredentialsBehavior,GatewayStaticAddresses,BackendTLSPolicyConflictResolution" echo "Start Gateway API Conformance Testing" -go test ./conformance -v -timeout 60m -run TestConformance -args "--gateway-class=conformance" "--report-output=openshift.yaml" "--organization=Red Hat" "--project=Openshift Service Mesh" "--version=3.3.0" "--url=https://www.redhat.com/en/technologies/cloud-computing/openshift/container-platform" "--conformance-profiles=GATEWAY-HTTP,GATEWAY-GRPC" "--supported-features=${SUPPORTED_FEATURES}" "--skip-tests=${SKIPPED_TESTS}" +go test ./conformance -v -timeout 60m -run TestConformance -args "--gateway-class=conformance" "--report-output=openshift.yaml" "--organization=Red Hat" "--project=Openshift Service Mesh" "--version=3.3.1" "--url=https://www.redhat.com/en/technologies/cloud-computing/openshift/container-platform" "--conformance-profiles=GATEWAY-HTTP,GATEWAY-GRPC" "--supported-features=${SUPPORTED_FEATURES}" "--skip-tests=${SKIPPED_TESTS}" cat conformance/openshift.yaml diff --git a/manifests/02-deployment-ibm-cloud-managed.yaml b/manifests/02-deployment-ibm-cloud-managed.yaml index ec17e0205..d8a7183e8 100644 --- a/manifests/02-deployment-ibm-cloud-managed.yaml +++ b/manifests/02-deployment-ibm-cloud-managed.yaml @@ -59,9 +59,9 @@ spec: - name: GATEWAY_API_OPERATOR_CHANNEL value: stable - name: GATEWAY_API_OPERATOR_VERSION - value: servicemeshoperator3.v3.3.0 + value: servicemeshoperator3.v3.3.1 - name: ISTIO_VERSION - value: v1.28.4 + value: v1.28.5 image: openshift/origin-cluster-ingress-operator:latest imagePullPolicy: IfNotPresent name: ingress-operator diff --git a/manifests/02-deployment.yaml b/manifests/02-deployment.yaml index 5419470c2..71de2e831 100644 --- a/manifests/02-deployment.yaml +++ b/manifests/02-deployment.yaml @@ -88,9 +88,9 @@ spec: - name: GATEWAY_API_OPERATOR_CHANNEL value: stable - name: GATEWAY_API_OPERATOR_VERSION - value: servicemeshoperator3.v3.3.0 + value: servicemeshoperator3.v3.3.1 - name: ISTIO_VERSION - value: v1.28.4 + value: v1.28.5 resources: requests: cpu: 10m