Skip to content

Commit

Permalink
fix (kubernetes-model-gatewayapi) : GatewayClass should not implement…
Browse files Browse the repository at this point in the history
… Namespaced interface (fabric8io#4654)

GatewayClass is a cluster scoped resource. It should not implement
Namespaced interface.

Signed-off-by: Rohan Kumar <rohaan@redhat.com>
  • Loading branch information
rohanKanojia committed Dec 30, 2022
1 parent d5a0e4c commit d89670e
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 60 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#### Improvements
* Fix #4637: all pod operations that require a ready / succeeded pod may use withReadyWaitTimeout, which supersedes withLogWaitTimeout.
* Fix #4633: provided inline access to all RunConfig builder methods via run().withNewRunConfig()
* Fix #4654: Fix GatewayClass to not implement Namespaced interface
* Fix #4670: the initial informer listing will use a resourceVersion of 0 to utilize the watch cache if possible. This means that the initial cache state when the informer is returned, or the start future is completed, may not be as fresh as the previous behavior which forced the latest version. It will of course become more consistent as the watch will already have been established.
* Fix #4694: [java-generator] Option to override the package name of the generated code.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
import io.fabric8.kubernetes.api.model.Namespaced;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
Expand Down Expand Up @@ -63,7 +62,7 @@
})
@Version("v1alpha2")
@Group("gateway.networking.k8s.io")
public class GatewayClass implements HasMetadata, Namespaced
public class GatewayClass implements HasMetadata
{

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
import io.fabric8.kubernetes.api.model.Namespaced;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
Expand Down Expand Up @@ -63,7 +62,7 @@
})
@Version("v1beta1")
@Group("gateway.networking.k8s.io")
public class GatewayClass implements HasMetadata, Namespaced
public class GatewayClass implements HasMetadata
{

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,7 @@
"additionalProperties": true,
"javaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass",
"javaInterfaces": [
"io.fabric8.kubernetes.api.model.HasMetadata",
"io.fabric8.kubernetes.api.model.Namespaced"
"io.fabric8.kubernetes.api.model.HasMetadata"
]
},
"kubernetes_sigs_gatewayapi_v1alpha2_GatewayClassList": {
Expand Down Expand Up @@ -2051,8 +2050,7 @@
"additionalProperties": true,
"javaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass",
"javaInterfaces": [
"io.fabric8.kubernetes.api.model.HasMetadata",
"io.fabric8.kubernetes.api.model.Namespaced"
"io.fabric8.kubernetes.api.model.HasMetadata"
]
},
"kubernetes_sigs_gatewayapi_v1beta1_GatewayClassList": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,7 @@
"additionalProperties": true,
"javaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass",
"javaInterfaces": [
"io.fabric8.kubernetes.api.model.HasMetadata",
"io.fabric8.kubernetes.api.model.Namespaced"
"io.fabric8.kubernetes.api.model.HasMetadata"
]
},
"kubernetes_sigs_gatewayapi_v1alpha2_GatewayClassList": {
Expand Down Expand Up @@ -2051,8 +2050,7 @@
"additionalProperties": true,
"javaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass",
"javaInterfaces": [
"io.fabric8.kubernetes.api.model.HasMetadata",
"io.fabric8.kubernetes.api.model.Namespaced"
"io.fabric8.kubernetes.api.model.HasMetadata"
]
},
"kubernetes_sigs_gatewayapi_v1beta1_GatewayClassList": {
Expand Down Expand Up @@ -3144,7 +3142,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "gateway.networking.k8s.io/v1alpha2",
"default": "gateway.networking.k8s.io/v1beta1",
"required": true
},
"kind": {
Expand All @@ -3157,12 +3155,12 @@
"existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta"
},
"spec": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayClassSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassSpec"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayClassSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassSpec"
},
"status": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayClassStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassStatus"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayClassStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassStatus"
}
},
"additionalProperties": true
Expand Down Expand Up @@ -3202,8 +3200,8 @@
"type": "string"
},
"parametersRef": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_ParametersReference",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ParametersReference"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_ParametersReference",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ParametersReference"
}
},
"additionalProperties": true
Expand All @@ -3225,14 +3223,14 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "gateway.networking.k8s.io/v1alpha2",
"default": "gateway.networking.k8s.io/v1beta1",
"required": true
},
"items": {
"type": "array",
"items": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_Gateway",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_Gateway",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway"
}
},
"kind": {
Expand Down Expand Up @@ -3305,8 +3303,8 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_SecretObjectReference",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.SecretObjectReference"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_SecretObjectReference",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.SecretObjectReference"
}
},
"mode": {
Expand All @@ -3328,8 +3326,8 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRouteFilter",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteFilter"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRouteFilter",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteFilter"
}
},
"group": {
Expand Down Expand Up @@ -3425,8 +3423,8 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPHeader",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPHeader"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPHeader",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPHeader"
}
},
"remove": {
Expand All @@ -3440,8 +3438,8 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPHeader",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPHeader"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPHeader",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPHeader"
}
}
},
Expand All @@ -3462,8 +3460,8 @@
"type": "string"
},
"path": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPPathModifier",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPPathModifier"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPPathModifier",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPPathModifier"
},
"port": {
"type": "integer"
Expand All @@ -3481,7 +3479,7 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "gateway.networking.k8s.io/v1beta1",
"default": "gateway.networking.k8s.io/v1alpha2",
"required": true
},
"kind": {
Expand All @@ -3494,12 +3492,12 @@
"existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta"
},
"spec": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRouteSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteSpec"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRouteSpec",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteSpec"
},
"status": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRouteStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteStatus"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRouteStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteStatus"
}
},
"additionalProperties": true
Expand Down Expand Up @@ -3536,14 +3534,14 @@
"properties": {
"apiVersion": {
"type": "string",
"default": "gateway.networking.k8s.io/v1alpha2",
"default": "gateway.networking.k8s.io/v1beta1",
"required": true
},
"items": {
"type": "array",
"items": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRoute",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRoute",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute"
}
},
"kind": {
Expand All @@ -3564,23 +3562,23 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPHeaderMatch",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPHeaderMatch"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPHeaderMatch",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPHeaderMatch"
}
},
"method": {
"type": "string"
},
"path": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPPathMatch",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPPathMatch"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPPathMatch",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPPathMatch"
},
"queryParams": {
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPQueryParamMatch",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPQueryParamMatch"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPQueryParamMatch",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPQueryParamMatch"
}
}
},
Expand Down Expand Up @@ -3628,16 +3626,16 @@
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_ParentReference",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ParentReference"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_ParentReference",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ParentReference"
}
},
"rules": {
"type": "array",
"javaOmitEmpty": true,
"items": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRouteRule",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteRule"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRouteRule",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteRule"
}
}
},
Expand All @@ -3648,8 +3646,8 @@
"parents": {
"type": "array",
"items": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_RouteParentStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.RouteParentStatus"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_RouteParentStatus",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.RouteParentStatus"
}
}
},
Expand All @@ -3661,8 +3659,8 @@
"type": "string"
},
"path": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPPathModifier",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPPathModifier"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPPathModifier",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPPathModifier"
}
},
"additionalProperties": true
Expand Down Expand Up @@ -3708,8 +3706,8 @@
"listener": {
"properties": {
"allowedRoutes": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_AllowedRoutes",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.AllowedRoutes"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_AllowedRoutes",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.AllowedRoutes"
},
"hostname": {
"type": "string"
Expand All @@ -3724,8 +3722,8 @@
"type": "string"
},
"tls": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayTLSConfig",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayTLSConfig"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayTLSConfig",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayTLSConfig"
}
},
"additionalProperties": true
Expand All @@ -3748,8 +3746,8 @@
"supportedKinds": {
"type": "array",
"items": {
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_RouteGroupKind",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.RouteGroupKind"
"$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_RouteGroupKind",
"existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.RouteGroupKind"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/**
* Copyright (C) 2015 Red Hat, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.fabric8.kubernetes.api.model.gatewayapi.v1beta1;

import io.fabric8.kubernetes.api.model.Namespaced;
import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;

class GatewayClassTest {
@Test
void isClusterScopedResource() {
assertThat(GatewayClass.class.isAssignableFrom(Namespaced.class)).isFalse();
}
}
2 changes: 2 additions & 0 deletions kubernetes-model-generator/pkg/schemagen/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,8 @@ func (g *schemaGenerator) isClusterScopedResource(t reflect.Type) bool {
"github.com/openshift/hive/apis/hive/v1/HiveConfig",
"sigs.k8s.io/kube-storage-version-migrator/pkg/apis/migration/v1alpha1/StorageState",
"sigs.k8s.io/kube-storage-version-migrator/pkg/apis/migration/v1alpha1/StorageVersionMigration",
"sigs.k8s.io/gateway-api/apis/v1alpha2/GatewayClass",
"sigs.k8s.io/gateway-api/apis/v1beta1/GatewayClass",
}

return Contains(clusterScopedResourcesList, t.PkgPath()+"/"+t.Name())
Expand Down

0 comments on commit d89670e

Please sign in to comment.