Skip to content

OCPBUGS-45729: Updating ose-openshift-apiserver-container image to be consistent with ART for 4.19 #486

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 4 commits into from
Jun 1, 2025
Merged

OCPBUGS-45729: Updating ose-openshift-apiserver-container image to be consistent with ART for 4.19 #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
786491d
Update go 1.23 and ocp 4.19
wangke19 Feb 17, 2025
d5c3941
Update k8s.io 0.32.1
wangke19 Mar 26, 2025
c596b6e
Update k8s.io 0.32.2 and k8s.io/apiserver reference of openshift/kube…
wangke19 May 20, 2025
b035979
Runs make verify to regenerate the needed code
wangke19 May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.22-openshift-4.18
tag: rhel-9-release-golang-1.23-openshift-4.19
229 changes: 115 additions & 114 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

382 changes: 181 additions & 201 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

74 changes: 73 additions & 1 deletion hack/openapi-violation.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ API rule violation: list_type_missing,github.com/openshift/api/config/v1,Serving
API rule violation: list_type_missing,github.com/openshift/api/config/v1,TestReportingSpec,TestsForFeatureGates
API rule violation: list_type_missing,github.com/openshift/api/config/v1alpha1,GatherConfig,DisabledGatherers
API rule violation: list_type_missing,github.com/openshift/api/console/v1,ConsoleCLIDownloadSpec,Links
API rule violation: list_type_missing,github.com/openshift/api/console/v1,ConsolePluginSpec,Proxy
API rule violation: list_type_missing,github.com/openshift/api/console/v1,ConsoleQuickStartSpec,AccessReviewResources
API rule violation: list_type_missing,github.com/openshift/api/console/v1,ConsoleQuickStartSpec,NextQuickStart
API rule violation: list_type_missing,github.com/openshift/api/console/v1,ConsoleQuickStartSpec,Prerequisites
Expand Down Expand Up @@ -462,6 +461,7 @@ API rule violation: names_match,github.com/openshift/api/machine/v1,FailureDomai
API rule violation: names_match,github.com/openshift/api/machine/v1,FailureDomains,VSphere
API rule violation: names_match,github.com/openshift/api/machine/v1,NutanixMachineProviderConfig,GPUs
API rule violation: names_match,github.com/openshift/api/machine/v1,NutanixMachineProviderConfig,VCPUsPerSocket
API rule violation: names_match,github.com/openshift/api/machine/v1,OpenShiftMachineV1Beta1MachineTemplate,ObjectMeta
API rule violation: names_match,github.com/openshift/api/machine/v1,PowerVSMachineProviderStatus,InstanceID
API rule violation: names_match,github.com/openshift/api/machine/v1,PowerVSResource,RegEx
API rule violation: names_match,github.com/openshift/api/machine/v1,Tag,Key
Expand Down Expand Up @@ -506,6 +506,8 @@ API rule violation: names_match,github.com/openshift/api/machine/v1beta1,GCPDisk
API rule violation: names_match,github.com/openshift/api/machine/v1beta1,GCPMachineProviderSpec,GPUs
API rule violation: names_match,github.com/openshift/api/machine/v1beta1,GCPMachineProviderSpec,Metadata
API rule violation: names_match,github.com/openshift/api/machine/v1beta1,GCPMachineProviderStatus,InstanceID
API rule violation: names_match,github.com/openshift/api/machine/v1beta1,MachineSpec,ObjectMeta
API rule violation: names_match,github.com/openshift/api/machine/v1beta1,MachineTemplateSpec,ObjectMeta
API rule violation: names_match,github.com/openshift/api/machine/v1beta1,VSphereMachineProviderStatus,InstanceID
API rule violation: names_match,github.com/openshift/api/network/v1,ClusterNetwork,HostSubnetLength
API rule violation: names_match,github.com/openshift/api/network/v1,ClusterNetworkEntry,CIDR
Expand Down Expand Up @@ -571,6 +573,12 @@ API rule violation: names_match,k8s.io/api/resource/v1alpha3,DeviceAttribute,Boo
API rule violation: names_match,k8s.io/api/resource/v1alpha3,DeviceAttribute,IntValue
API rule violation: names_match,k8s.io/api/resource/v1alpha3,DeviceAttribute,StringValue
API rule violation: names_match,k8s.io/api/resource/v1alpha3,DeviceAttribute,VersionValue
API rule violation: names_match,k8s.io/api/resource/v1alpha3,NetworkDeviceData,IPs
API rule violation: names_match,k8s.io/api/resource/v1beta1,DeviceAttribute,BoolValue
API rule violation: names_match,k8s.io/api/resource/v1beta1,DeviceAttribute,IntValue
API rule violation: names_match,k8s.io/api/resource/v1beta1,DeviceAttribute,StringValue
API rule violation: names_match,k8s.io/api/resource/v1beta1,DeviceAttribute,VersionValue
API rule violation: names_match,k8s.io/api/resource/v1beta1,NetworkDeviceData,IPs
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Ref
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Schema
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XEmbeddedResource
Expand Down Expand Up @@ -661,3 +669,67 @@ API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,Generi
API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,LeaderMigrationEnabled
API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,MinResyncPeriod
API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,Port
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/apiserver/v1,APIRequestCountList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,APIServerList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,AuthenticationList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,BuildList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,ClusterOperatorList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,ClusterVersionList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,ConsoleList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,DNSList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,FeatureGateList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,ImageContentPolicyList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,ImageDigestMirrorSetList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,ImageList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,ImageTagMirrorSetList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,InfrastructureList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,IngressList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,NetworkList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,NodeList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,OAuthList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,OperatorHubList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,ProjectList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,ProxyList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1,SchedulerList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1alpha1,BackupList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1alpha1,ClusterImagePolicyList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1alpha1,ImagePolicyList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/config/v1alpha1,InsightsDataGatherList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/console/v1,ConsoleCLIDownloadList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/console/v1,ConsoleExternalLogLinkList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/console/v1,ConsoleLinkList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/console/v1,ConsoleNotificationList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/console/v1,ConsolePluginList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/console/v1,ConsoleQuickStartList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/console/v1,ConsoleSampleList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/console/v1,ConsoleYAMLSampleList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/helm/v1beta1,HelmChartRepositoryList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/helm/v1beta1,ProjectHelmChartRepositoryList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/monitoring/v1,AlertRelabelConfigList,Items
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/monitoring/v1,AlertingRuleList,Items
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,AuthenticationList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,CloudCredentialList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,ConfigList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,ConsoleList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,EtcdList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,InsightsOperatorList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,KubeAPIServerList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,KubeControllerManagerList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,KubeSchedulerList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,KubeStorageVersionMigratorList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,MachineConfigurationList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,OLMList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,OpenShiftAPIServerList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,OpenShiftControllerManagerList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,ServiceCAList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,ServiceCatalogAPIServerList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1,ServiceCatalogControllerManagerList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1alpha1,ClusterVersionOperatorList,Items
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1alpha1,ClusterVersionOperatorList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1alpha1,EtcdBackupList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1alpha1,ImageContentSourcePolicyList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operator/v1alpha1,OLMList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/operatorcontrolplane/v1alpha1,PodNetworkConnectivityCheckList,ListMeta
API rule violation: streaming_list_type_json_tags,github.com/openshift/api/samples/v1,ConfigList,ListMeta
API rule violation: streaming_list_type_proto_tags,k8s.io/apimachinery/pkg/apis/meta/v1beta1,PartialObjectMetadataList,Items
API rule violation: streaming_list_type_proto_tags,k8s.io/apimachinery/pkg/apis/meta/v1beta1,PartialObjectMetadataList,ListMeta
4 changes: 2 additions & 2 deletions images/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
WORKDIR /go/src/github.com/openshift/openshift-apiserver
COPY . .
RUN make build --warn-undefined-variables

FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
COPY --from=builder /go/src/github.com/openshift/openshift-apiserver/openshift-apiserver /usr/bin/
ENTRYPOINT ["/usr/bin/openshift-apiserver"]
LABEL io.k8s.display-name="OpenShift API Server Command" \
Expand Down
2 changes: 1 addition & 1 deletion pkg/apps/apis/apps/log_options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestLogOptionsDrift(t *testing.T) {
name := popts.Field(i).Name
doptsField, found := dopts.FieldByName(name)
// TODO: Add this option to deployment config log options
if name == "InsecureSkipTLSVerifyBackend" {
if name == "InsecureSkipTLSVerifyBackend" || name == "Stream" {
continue
}
if !found {
Expand Down
Loading