diff --git a/kubernetes-model-generator/go.mod b/kubernetes-model-generator/go.mod index bf8bdbfb600..35c4a97f6e2 100644 --- a/kubernetes-model-generator/go.mod +++ b/kubernetes-model-generator/go.mod @@ -17,15 +17,15 @@ require ( github.com/operator-framework/api v0.10.7 github.com/operator-framework/operator-lifecycle-manager v0.19.1 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.57.0 - k8s.io/api v0.27.3 - k8s.io/apiextensions-apiserver v0.27.3 - k8s.io/apimachinery v0.27.3 + k8s.io/api v0.28.2 + k8s.io/apiextensions-apiserver v0.28.2 + k8s.io/apimachinery v0.28.2 k8s.io/client-go v12.0.0+incompatible - k8s.io/kube-aggregator v0.27.3 - k8s.io/metrics v0.27.3 + k8s.io/kube-aggregator v0.28.2 + k8s.io/metrics v0.28.2 sigs.k8s.io/gateway-api v0.6.1 sigs.k8s.io/kube-storage-version-migrator v0.0.5 - sigs.k8s.io/kustomize/api v0.13.1 + sigs.k8s.io/kustomize/api v0.14.0 ) require ( @@ -45,13 +45,12 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/gnostic v0.6.9 // indirect + github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.3.0 // indirect github.com/h2non/filetype v1.1.1 // indirect github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect - github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kdomanski/iso9660 v0.2.1 // indirect @@ -64,29 +63,28 @@ require ( github.com/operator-framework/operator-registry v1.17.5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect - github.com/spf13/cobra v1.6.1 // indirect - go.uber.org/atomic v1.8.0 // indirect - go.uber.org/multierr v1.6.0 // indirect + go.uber.org/atomic v1.10.0 // indirect + go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/net v0.10.0 // indirect - golang.org/x/oauth2 v0.5.0 // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/term v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect + golang.org/x/net v0.13.0 // indirect + golang.org/x/oauth2 v0.8.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/term v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect - google.golang.org/grpc v1.53.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect + google.golang.org/grpc v1.54.0 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect - k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect + k8s.io/klog/v2 v2.100.1 // indirect + k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect + k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect sigs.k8s.io/controller-runtime v0.15.0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/kustomize/kyaml v0.14.0 // indirect + sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) @@ -106,11 +104,11 @@ replace ( github.com/openshift/assisted-service/models => github.com/openshift/assisted-service/models v0.0.0-20220928142635-a40422bdea61 github.com/terraform-providers/terraform-provider-aws => github.com/openshift/terraform-provider-aws v1.60.1-0.20211215220004-24df6d73af46 github.com/terraform-providers/terraform-provider-ignition/v2 => github.com/community-terraform-providers/terraform-provider-ignition/v2 v2.1.0 - k8s.io/client-go => k8s.io/client-go v0.27.3 + k8s.io/client-go => k8s.io/client-go v0.28.2 k8s.io/cloud-provider-vsphere => github.com/openshift/cloud-provider-vsphere v1.19.1-0.20211222185833-7829863d0558 - k8s.io/component-helpers => k8s.io/component-helpers v0.27.3 - k8s.io/controller-manager => k8s.io/controller-manager v0.27.3 - k8s.io/mount-utils => k8s.io/mount-utils v0.27.3 + k8s.io/component-helpers => k8s.io/component-helpers v0.28.2 + k8s.io/controller-manager => k8s.io/controller-manager v0.28.2 + k8s.io/mount-utils => k8s.io/mount-utils v0.28.2 sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.5 sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20201125052318-b85a18cbf338 sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.0.0-20210209143830-3442c7a36c1e diff --git a/kubernetes-model-generator/go.sum b/kubernetes-model-generator/go.sum index f6ff1cd4d43..adc2a762c34 100644 --- a/kubernetes-model-generator/go.sum +++ b/kubernetes-model-generator/go.sum @@ -192,7 +192,6 @@ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dR github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/bugsnag/bugsnag-go v1.5.3 h1:yeRUT3mUE13jL1tGwvoQsKdVbAsQx9AJ+fqahKveP04= github.com/bugsnag/bugsnag-go v1.5.3/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA= @@ -407,6 +406,7 @@ github.com/elazarl/goproxy v0.0.0-20190911111923-ecfe977594f1/go.mod h1:Ro8st/El github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.10.0+incompatible h1:l6Soi8WCOOVAeCo4W98iBFC6Og7/X8bpRt51oNLZ2C8= github.com/emicklei/go-restful v2.10.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= @@ -442,7 +442,6 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -664,8 +663,8 @@ github.com/google/cel-go v0.9.0/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSx github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw= github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= -github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= -github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -811,7 +810,6 @@ github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= -github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/itchyny/astgen-go v0.0.0-20200519013840-cf3ea398f645/go.mod h1:296z3W7Xsrp2mlIY88ruDKscuvrkL6zXCNRtaYVshzw= github.com/itchyny/go-flags v1.5.0/go.mod h1:lenkYuCobuxLBAd/HGFE4LRoW8D3B6iXRQfWYJ+MNbA= @@ -1057,6 +1055,7 @@ github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJ github.com/onsi/ginkgo/v2 v2.9.0/go.mod h1:4xkjoL/tZv4SMWeww56BU5kAt19mVB47gTWxmrTcxyk= github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo= github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts= +github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM= github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -1233,8 +1232,8 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= -github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= +github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1256,8 +1255,8 @@ github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+ github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1271,8 +1270,8 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= @@ -1336,8 +1335,7 @@ github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJ github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -1371,8 +1369,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= @@ -1440,8 +1439,8 @@ gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= @@ -1510,8 +1509,9 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.8.0 h1:CUhrE4N1rqSE6FM9ecihEjRkLQu8cDfgDyoOs83mEY4= go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= @@ -1520,8 +1520,9 @@ go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= @@ -1565,6 +1566,7 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1697,8 +1699,10 @@ golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY= +golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1719,8 +1723,9 @@ golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= +golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1869,8 +1874,10 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1882,8 +1889,10 @@ golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= +golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1899,8 +1908,9 @@ golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1998,6 +2008,7 @@ golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= +golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4= golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2121,10 +2132,9 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -2162,8 +2172,8 @@ google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= -google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= -google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= +google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= +google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= google.golang.org/grpc/cmd/protoc-gen-go-grpc v0.0.0-20200709232328-d8193ee9cc3e/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -2274,8 +2284,8 @@ k8s.io/api v0.23.1/go.mod h1:WfXnOnwSqNtG62Y1CdjoMxh7r7u9QXGCkA1u0na2jgo= k8s.io/api v0.24.2/go.mod h1:AHqbSkTm6YrQ0ObxjO3Pmp/ubFF/KuM7jU+3khoBsOg= k8s.io/api v0.27.1/go.mod h1:z5g/BpAiD+f6AArpqNjkY+cji8ueZDU/WV1jcj5Jk4E= k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4= -k8s.io/api v0.27.3 h1:yR6oQXXnUEBWEWcvPWS0jQL575KoAboQPfJAuKNrw5Y= -k8s.io/api v0.27.3/go.mod h1:C4BNvZnQOF7JA/0Xed2S+aUyJSfTGkGFxLXz9MnpIpg= +k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw= +k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg= k8s.io/apiextensions-apiserver v0.17.0/go.mod h1:XiIFUakZywkUl54fVXa7QTEHcqQz9HG55nHd1DCoHj8= k8s.io/apiextensions-apiserver v0.18.0-beta.2/go.mod h1:Hnrg5jx8/PbxRbUoqDGxtQkULjwx8FDW4WYJaKNK+fk= k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY= @@ -2294,8 +2304,8 @@ k8s.io/apiextensions-apiserver v0.22.0/go.mod h1:+9w/QQC/lwH2qTbpqndXXjwBgidlSmy k8s.io/apiextensions-apiserver v0.22.1/go.mod h1:HeGmorjtRmRLE+Q8dJu6AYRoZccvCMsghwS8XTUYb2c= k8s.io/apiextensions-apiserver v0.23.0/go.mod h1:xIFAEEDlAZgpVBl/1VSjGDmLoXAWRG40+GsWhKhAxY4= k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ= -k8s.io/apiextensions-apiserver v0.27.3 h1:xAwC1iYabi+TDfpRhxh4Eapl14Hs2OftM2DN5MpgKX4= -k8s.io/apiextensions-apiserver v0.27.3/go.mod h1:BH3wJ5NsB9XE1w+R6SSVpKmYNyIiyIz9xAmBl8Mb+84= +k8s.io/apiextensions-apiserver v0.28.2 h1:J6/QRWIKV2/HwBhHRVITMLYoypCoPY1ftigDM0Kn+QU= +k8s.io/apiextensions-apiserver v0.28.2/go.mod h1:5tnkxLGa9nefefYzWuAlWZ7RZYuN/765Au8cWLA6SRg= k8s.io/apimachinery v0.0.0-20181110190943-2a7c93004028/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= k8s.io/apimachinery v0.18.0-beta.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= @@ -2322,8 +2332,8 @@ k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2U k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM= k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= -k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM= -k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= +k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ= +k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU= k8s.io/apiserver v0.17.0/go.mod h1:ABM+9x/prjINN6iiffRVNCBR2Wk7uY4z+EtEGZD48cg= k8s.io/apiserver v0.18.0-beta.2/go.mod h1:bnblMkMoCFnIfVnVftd0SXJPzyvrk3RtaqSbblphF/A= k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw= @@ -2349,8 +2359,8 @@ k8s.io/cli-runtime v0.20.6/go.mod h1:JVERW478qcxWrUjJuWQSqyJeiz9QC4T6jmBznHFBC8w k8s.io/cli-runtime v0.21.0/go.mod h1:XoaHP93mGPF37MkLbjGVYqg3S1MnsFdKtiA/RZzzxOo= k8s.io/cli-runtime v0.22.1/go.mod h1:YqwGrlXeEk15Yn3em2xzr435UGwbrCw5x+COQoTYfoo= k8s.io/cli-runtime v0.23.0/go.mod h1:B5N3YH0KP1iKr6gEuJ/RRmGjO0mJQ/f/JrsmEiPQAlU= -k8s.io/client-go v0.27.3 h1:7dnEGHZEJld3lYwxvLl7WoehK6lAq7GvgjxpA3nv1E8= -k8s.io/client-go v0.27.3/go.mod h1:2MBEKuTo6V1lbKy3z1euEGnhPfGZLKTS9tiJ2xodM48= +k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY= +k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY= k8s.io/cluster-bootstrap v0.23.1/go.mod h1:p2732QxwSa13WPemmyIeykk16qVw15W7lgNRB6x7NpY= k8s.io/code-generator v0.0.0-20181114232248-ae218e241252/go.mod h1:IPqxl/YHk05nodzupwjke6ctMjyNRdV2zZ5/j3/F204= k8s.io/code-generator v0.17.0/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s= @@ -2392,7 +2402,7 @@ k8s.io/component-base v0.22.0/go.mod h1:SXj6Z+V6P6GsBhHZVbWCw9hFjUdUYnJerlhhPnYC k8s.io/component-base v0.22.1/go.mod h1:0D+Bl8rrnsPN9v0dyYvkqFfBeAd4u7n77ze+p8CMiPo= k8s.io/component-base v0.23.0/go.mod h1:DHH5uiFvLC1edCpvcTDV++NKULdYYU6pR9Tt3HIKMKI= k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo= -k8s.io/component-helpers v0.27.3/go.mod h1:uxhXqoWHh4eBVcPj+LKWjtQq0V/vP5ihn4xmf5xNZso= +k8s.io/component-helpers v0.28.2/go.mod h1:pF1R5YWQ+sgf0i6EbVm+MQCzkYuqutDUibdrkvAa6aI= k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -2419,8 +2429,9 @@ k8s.io/klog/v2 v2.10.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= +k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kms v0.27.2/go.mod h1:dahSqjI05J55Fo5qipzvHSRbm20d7llrSeQjjl86A7c= k8s.io/kube-aggregator v0.18.0-beta.2/go.mod h1:O3Td9mheraINbLHH4pzoFP2gRzG0Wk1COqzdSL4rBPk= k8s.io/kube-aggregator v0.18.2/go.mod h1:ijq6FnNUoKinA6kKbkN6svdTacSoQVNtKqmQ1+XJEYQ= @@ -2433,8 +2444,8 @@ k8s.io/kube-aggregator v0.22.0-rc.0/go.mod h1:g0xtiBSsbMKvewN7xR/Icib4TrHxtvrJcH k8s.io/kube-aggregator v0.22.0/go.mod h1:zHTepg0Q4tKzru7Pwg1QYHWrU/wrvIXM8hUdDAH66qg= k8s.io/kube-aggregator v0.22.1/go.mod h1:VbmI+8fUeCPkzSvarWTrlIGEgUGEGI/66SFajDQ0Pdc= k8s.io/kube-aggregator v0.23.0/go.mod h1:b1vpoaTWKZjCzvbe1KXFw3vPbISrghJsg7/RI8oZUME= -k8s.io/kube-aggregator v0.27.3 h1:0o/Q30C84hHvhUef7OOTHMhO2eCySOPHKOUUrhBwpfo= -k8s.io/kube-aggregator v0.27.3/go.mod h1:zbx67NbFee9cqjbXjib89/oOyrXdOq3UYStIBGazv08= +k8s.io/kube-aggregator v0.28.2 h1:tCjAfB1p/v18yD2NpegNQRuahzyA/szFfcRARnpjDeo= +k8s.io/kube-aggregator v0.28.2/go.mod h1:g4hZVjC4KhJtZHV2pyiRBiU6AdBA/sAjh9Y9GJC/SbU= k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= @@ -2447,8 +2458,9 @@ k8s.io/kube-openapi v0.0.0-20210527164424-3c818078ee3d/go.mod h1:vHXdDvt9+2spS2R k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= k8s.io/kube-proxy v0.22.1/go.mod h1:Rj3/mSZuSKfDY7XVbDgb12UwiQHy265LOwpK/yR2rtc= k8s.io/kubectl v0.18.0-rc.1/go.mod h1:UpG1w7klD633nyMS73/29cNl2tMdEbXU0nWupttyha4= k8s.io/kubectl v0.19.0/go.mod h1:gPCjjsmE6unJzgaUNXIFGZGafiUp5jh0If3F/x7/rRg= @@ -2465,8 +2477,8 @@ k8s.io/metrics v0.20.6/go.mod h1:d+OAIaXutom9kGWcBit/M8OkDpIzBKTsm47+KcUt7VI= k8s.io/metrics v0.21.0/go.mod h1:L3Ji9EGPP1YBbfm9sPfEXSpnj8i24bfQbAFAsW0NueQ= k8s.io/metrics v0.22.1/go.mod h1:i/ZNap89UkV1gLa26dn7fhKAdheJaKy+moOqJbiif7E= k8s.io/metrics v0.23.0/go.mod h1:NDiZTwppEtAuKJ1Rxt3S4dhyRzdp6yUcJf0vo023dPo= -k8s.io/metrics v0.27.3 h1:pBVKgQjfui8xzfTidIxiOmLHwcCk3KbeuWowo/Oh0t0= -k8s.io/metrics v0.27.3/go.mod h1:pXj63OTdOjpYgSc95p+88fB3t4krLybM7MOeqIksI6o= +k8s.io/metrics v0.28.2 h1:Z/oMk5SmiT/Ji1SaWOPfW2l9W831BLO9/XxDq9iS3ak= +k8s.io/metrics v0.28.2/go.mod h1:QTIIdjMrq+KodO+rmp6R9Pr1LZO8kTArNtkWoQXw0sw= k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= @@ -2481,8 +2493,9 @@ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 h1:kmDqav+P+/5e1i9tFfHq1qcF3sOrDp+YEkVDAHu7Jwk= -k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU= +k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= @@ -2525,8 +2538,8 @@ sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5 sigs.k8s.io/kustomize/api v0.8.5/go.mod h1:M377apnKT5ZHJS++6H4rQoCHmWtt6qTpp3mbe7p6OLY= sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH83nJtY1g= sigs.k8s.io/kustomize/api v0.10.1/go.mod h1:2FigT1QN6xKdcnGS2Ppp1uIWrtWN28Ms8A3OZUZhwr8= -sigs.k8s.io/kustomize/api v0.13.1 h1:2jLAM6w5nGznnQgq2V0YUMFGtAixD2SO8Q+f5B9Un9U= -sigs.k8s.io/kustomize/api v0.13.1/go.mod h1:KDhwElNK4jxc2/cEpFQOnYT/72t+ET7yeasogV89ow4= +sigs.k8s.io/kustomize/api v0.14.0 h1:6+QLmXXA8X4eDM7ejeaNUyruA1DDB3PVIjbpVhDOJRA= +sigs.k8s.io/kustomize/api v0.14.0/go.mod h1:vmOXlC8BcmcUJQjiceUbcyQ75JBP6eg8sgoyzc+eLpQ= sigs.k8s.io/kustomize/cmd/config v0.9.7/go.mod h1:MvXCpHs77cfyxRmCNUQjIqCmZyYsbn5PyQpWiq44nW0= sigs.k8s.io/kustomize/cmd/config v0.9.13/go.mod h1:7547FLF8W/lTaDf0BDqFTbZxM9zqwEJqCKN9sSR0xSs= sigs.k8s.io/kustomize/cmd/config v0.10.2/go.mod h1:K2aW7nXJ0AaT+VA/eO0/dzFLxmpFcTzudmAgDwPY1HQ= @@ -2536,8 +2549,8 @@ sigs.k8s.io/kustomize/kustomize/v4 v4.4.1/go.mod h1:qOKJMMz2mBP+vcS7vK+mNz4HBLja sigs.k8s.io/kustomize/kyaml v0.10.15/go.mod h1:mlQFagmkm1P+W4lZJbJ/yaxMd8PqMRSC4cPcfUVt5Hg= sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod h1:GNMwjim4Ypgp/MueD3zXHLRJEjz7RvtPae0AwlvEMFM= sigs.k8s.io/kustomize/kyaml v0.13.0/go.mod h1:FTJxEZ86ScK184NpGSAQcfEqee0nul8oLCK30D47m4E= -sigs.k8s.io/kustomize/kyaml v0.14.0 h1:uzH0MzMtYypHW09LbMDk8k/lT/LSsUuCoZIuEGhIBNE= -sigs.k8s.io/kustomize/kyaml v0.14.0/go.mod h1:AN1/IpawKilWD7V+YvQwRGUvuUOOWpjsHu6uHwonSF4= +sigs.k8s.io/kustomize/kyaml v0.14.3 h1:WpabVAKZe2YEp/irTSHwD6bfjwZnTtSDewd2BVJGMZs= +sigs.k8s.io/kustomize/kyaml v0.14.3/go.mod h1:npvh9epWysfQ689Rtt/U+dpOJDTBn8kUnF1O6VzvmZA= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-admissionregistration/cmd/generate/generate.go index a6e0f73c4d1..ab20ed1aaca 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/cmd/generate/generate.go @@ -16,142 +16,147 @@ package main import ( - "bytes" - "encoding/json" - "fmt" - // Dependencies - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/api/resource" - apimachineryversion "k8s.io/apimachinery/pkg/version" - authenticationapi "k8s.io/api/authentication/v1" - authenticationv1beta1 "k8s.io/api/authentication/v1beta1" - authenticationv1alpha1 "k8s.io/api/authentication/v1alpha1" + "bytes" + "encoding/json" + "fmt" + // Dependencies + authenticationapi "k8s.io/api/authentication/v1" + authenticationv1alpha1 "k8s.io/api/authentication/v1alpha1" + authenticationv1beta1 "k8s.io/api/authentication/v1beta1" + "k8s.io/apimachinery/pkg/api/resource" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apimachineryversion "k8s.io/apimachinery/pkg/version" - v1beta1admission "k8s.io/api/admission/v1beta1" - v1admission "k8s.io/api/admission/v1" - admissionregistrationv1alpha1 "k8s.io/api/admissionregistration/v1alpha1" - admissionregistrationv1 "k8s.io/api/admissionregistration/v1" - admissionregistration "k8s.io/api/admissionregistration/v1beta1" - k8sauthapi "k8s.io/api/authorization/v1" - k8sauthapiv1beta1 "k8s.io/api/authorization/v1beta1" + v1admission "k8s.io/api/admission/v1" + v1beta1admission "k8s.io/api/admission/v1beta1" + admissionregistrationv1 "k8s.io/api/admissionregistration/v1" + admissionregistrationv1alpha1 "k8s.io/api/admissionregistration/v1alpha1" + admissionregistration "k8s.io/api/admissionregistration/v1beta1" + k8sauthapi "k8s.io/api/authorization/v1" + k8sauthapiv1beta1 "k8s.io/api/authorization/v1beta1" - "log" - "reflect" - "strings" - "time" + "log" + "reflect" + "strings" + "time" - "os" + "os" - "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/pkg/schemagen" + "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/pkg/schemagen" ) type Schema struct { - Info apimachineryversion.Info - APIGroup metav1.APIGroup - APIGroupList metav1.APIGroupList - BaseKubernetesList metav1.List - ObjectMeta metav1.ObjectMeta - TypeMeta metav1.TypeMeta - Status metav1.Status - Patch metav1.Patch - ListOptions metav1.ListOptions - DeleteOptions metav1.DeleteOptions - CreateOptions metav1.CreateOptions - UpdateOptions metav1.UpdateOptions - GetOptions metav1.GetOptions - PatchOptions metav1.PatchOptions - Time metav1.Time - RootPaths metav1.RootPaths - Quantity resource.Quantity + Info apimachineryversion.Info + APIGroup metav1.APIGroup + APIGroupList metav1.APIGroupList + BaseKubernetesList metav1.List + ObjectMeta metav1.ObjectMeta + TypeMeta metav1.TypeMeta + Status metav1.Status + Patch metav1.Patch + ListOptions metav1.ListOptions + DeleteOptions metav1.DeleteOptions + CreateOptions metav1.CreateOptions + UpdateOptions metav1.UpdateOptions + GetOptions metav1.GetOptions + PatchOptions metav1.PatchOptions + Time metav1.Time + RootPaths metav1.RootPaths + Quantity resource.Quantity - TokenReview authenticationapi.TokenReview - TokenRequest authenticationapi.TokenRequest - V1Beta1SelfSubjectReview authenticationv1beta1.SelfSubjectReview - SelfSubjectReview authenticationv1alpha1.SelfSubjectReview + TokenReview authenticationapi.TokenReview + TokenRequest authenticationapi.TokenRequest + V1Beta1SelfSubjectReview authenticationv1beta1.SelfSubjectReview + SelfSubjectReview authenticationv1alpha1.SelfSubjectReview + V1SelfSubjectReview authenticationapi.SelfSubjectReview - V1Beta1AdmissionReview v1beta1admission.AdmissionReview - V1Beta1AdmissionRequest v1beta1admission.AdmissionRequest - V1Beta1AdmissionResponse v1beta1admission.AdmissionResponse - V1Beta1PatchType v1beta1admission.PatchType - V1Beta1Operation v1beta1admission.Operation - V1AdmissionReview v1admission.AdmissionReview - V1AdmissionRequest v1admission.AdmissionRequest - V1AdmissionResponse v1admission.AdmissionResponse - V1PatchType v1admission.PatchType - V1Operation v1admission.Operation - ValidatingAdmissionPolicies admissionregistrationv1alpha1.ValidatingAdmissionPolicy - ValidatingAdmissionPoliciesList admissionregistrationv1alpha1.ValidatingAdmissionPolicyList - ValidatingAdmissionPolicyBinding admissionregistrationv1alpha1.ValidatingAdmissionPolicyBinding - ValidatingAdmissionPolicyBindingList admissionregistrationv1alpha1.ValidatingAdmissionPolicyBindingList - Rule admissionregistration.Rule - ValidatingWebhookConfiguration admissionregistration.ValidatingWebhookConfiguration - ValidatingWebhookConfigurationList admissionregistration.ValidatingWebhookConfigurationList - MutatingWebhookConfiguration admissionregistration.MutatingWebhookConfiguration - MutatingWebhookConfigurationList admissionregistration.MutatingWebhookConfigurationList - RuleWithOperations admissionregistration.RuleWithOperations - ServiceReference admissionregistration.ServiceReference - V1Rule admissionregistrationv1.Rule - V1ValidatingWebhookConfiguration admissionregistrationv1.ValidatingWebhookConfiguration - V1ValidatingWebhookConfigurationList admissionregistrationv1.ValidatingWebhookConfigurationList - V1MutatingWebhookConfiguration admissionregistrationv1.MutatingWebhookConfiguration - V1MutatingWebhookConfigurationList admissionregistrationv1.MutatingWebhookConfigurationList - V1RuleWithOperations admissionregistrationv1.RuleWithOperations - V1ServiceReference admissionregistrationv1.ServiceReference - K8sSubjectAccessReview k8sauthapi.SubjectAccessReview - K8sLocalSubjectAccessReview k8sauthapi.LocalSubjectAccessReview - SelfSubjectRulesReview k8sauthapi.SelfSubjectRulesReview - SelfSubjectAccessReview k8sauthapi.SelfSubjectAccessReview - V1beta1K8sSubjectAccessReview k8sauthapiv1beta1.SubjectAccessReview - V1beta1K8sLocalSubjectAccessReview k8sauthapiv1beta1.LocalSubjectAccessReview - V1beta1SelfSubjectRulesReview k8sauthapiv1beta1.SelfSubjectRulesReview - V1beta1SelfSubjectAccessReview k8sauthapiv1beta1.SelfSubjectAccessReview + V1Beta1AdmissionReview v1beta1admission.AdmissionReview + V1Beta1AdmissionRequest v1beta1admission.AdmissionRequest + V1Beta1AdmissionResponse v1beta1admission.AdmissionResponse + V1Beta1PatchType v1beta1admission.PatchType + V1Beta1Operation v1beta1admission.Operation + V1AdmissionReview v1admission.AdmissionReview + V1AdmissionRequest v1admission.AdmissionRequest + V1AdmissionResponse v1admission.AdmissionResponse + V1PatchType v1admission.PatchType + V1Operation v1admission.Operation + ValidatingAdmissionPolicies admissionregistrationv1alpha1.ValidatingAdmissionPolicy + ValidatingAdmissionPoliciesList admissionregistrationv1alpha1.ValidatingAdmissionPolicyList + ValidatingAdmissionPolicyBinding admissionregistrationv1alpha1.ValidatingAdmissionPolicyBinding + ValidatingAdmissionPolicyBindingList admissionregistrationv1alpha1.ValidatingAdmissionPolicyBindingList + V1Beta1ValidatingAdmissionPolicy admissionregistration.ValidatingAdmissionPolicy + V1Beta1ValidatingAdmissionPolicyList admissionregistration.ValidatingAdmissionPolicyList + V1Beta1ValidatingAdmissionPolicyBinding admissionregistration.ValidatingAdmissionPolicyBinding + V1Beta1ValidatingAdmissionPolicyBindingList admissionregistration.ValidatingAdmissionPolicyBindingList + Rule admissionregistration.Rule + ValidatingWebhookConfiguration admissionregistration.ValidatingWebhookConfiguration + ValidatingWebhookConfigurationList admissionregistration.ValidatingWebhookConfigurationList + MutatingWebhookConfiguration admissionregistration.MutatingWebhookConfiguration + MutatingWebhookConfigurationList admissionregistration.MutatingWebhookConfigurationList + RuleWithOperations admissionregistration.RuleWithOperations + ServiceReference admissionregistration.ServiceReference + V1Rule admissionregistrationv1.Rule + V1ValidatingWebhookConfiguration admissionregistrationv1.ValidatingWebhookConfiguration + V1ValidatingWebhookConfigurationList admissionregistrationv1.ValidatingWebhookConfigurationList + V1MutatingWebhookConfiguration admissionregistrationv1.MutatingWebhookConfiguration + V1MutatingWebhookConfigurationList admissionregistrationv1.MutatingWebhookConfigurationList + V1RuleWithOperations admissionregistrationv1.RuleWithOperations + V1ServiceReference admissionregistrationv1.ServiceReference + K8sSubjectAccessReview k8sauthapi.SubjectAccessReview + K8sLocalSubjectAccessReview k8sauthapi.LocalSubjectAccessReview + SelfSubjectRulesReview k8sauthapi.SelfSubjectRulesReview + SelfSubjectAccessReview k8sauthapi.SelfSubjectAccessReview + V1beta1K8sSubjectAccessReview k8sauthapiv1beta1.SubjectAccessReview + V1beta1K8sLocalSubjectAccessReview k8sauthapiv1beta1.LocalSubjectAccessReview + V1beta1SelfSubjectRulesReview k8sauthapiv1beta1.SelfSubjectRulesReview + V1beta1SelfSubjectAccessReview k8sauthapiv1beta1.SelfSubjectAccessReview } func main() { - packages := []schemagen.PackageDescriptor{ - {"k8s.io/api/admission/v1beta1", "admission.k8s.io", "io.fabric8.kubernetes.api.model.admission.v1beta1", "kubernetes_admission_v1beta1_", true}, - {"k8s.io/api/admission/v1", "admission.k8s.io", "io.fabric8.kubernetes.api.model.admission.v1", "kubernetes_admission_v1_", true}, - {"k8s.io/api/admissionregistration/v1alpha1", "admissionregistration.k8s.io", "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1", "kubernetes_admissionregistration_v1alpha1_", true}, - {"k8s.io/api/admissionregistration/v1beta1", "admissionregistration.k8s.io", "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1", "kubernetes_admissionregistration_v1beta1_", true}, - {"k8s.io/api/admissionregistration/v1", "admissionregistration.k8s.io", "io.fabric8.kubernetes.api.model.admissionregistration.v1", "kubernetes_admissionregistration_v1_", true}, - {"k8s.io/api/authentication/v1", "authentication.k8s.io", "io.fabric8.kubernetes.api.model.authentication", "kubernetes_authentication_", true}, - {"k8s.io/api/authentication/v1alpha1", "authentication.k8s.io", "io.fabric8.kubernetes.api.model.authentication.v1alpha1", "kubernetes_authentication_v1alpha1_", true}, - {"k8s.io/api/authentication/v1beta1", "authentication.k8s.io", "io.fabric8.kubernetes.api.model.authentication.v1beta1", "kubernetes_authentication_v1beta1_", true}, - {"k8s.io/apimachinery/pkg/util/intstr", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_pkg_util_intstr_", false}, - {"k8s.io/apimachinery/pkg/runtime", "", "io.fabric8.kubernetes.api.model.runtime", "kubernetes_apimachinery_pkg_runtime_", false}, - {"k8s.io/apimachinery/pkg/version", "", "io.fabric8.kubernetes.api.model.version", "kubernetes_apimachinery_pkg_version_", false}, - {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, - {"k8s.io/api/authorization/v1", "authorization.k8s.io", "io.fabric8.kubernetes.api.model.authorization.v1", "kubernetes_authorization_v1_", true}, - {"k8s.io/api/authorization/v1beta1", "authorization.k8s.io", "io.fabric8.kubernetes.api.model.authorization.v1beta1", "kubernetes_authorization_v1beta1_", true}, - } + packages := []schemagen.PackageDescriptor{ + {"k8s.io/api/admission/v1beta1", "admission.k8s.io", "io.fabric8.kubernetes.api.model.admission.v1beta1", "kubernetes_admission_v1beta1_", true}, + {"k8s.io/api/admission/v1", "admission.k8s.io", "io.fabric8.kubernetes.api.model.admission.v1", "kubernetes_admission_v1_", true}, + {"k8s.io/api/admissionregistration/v1alpha1", "admissionregistration.k8s.io", "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1", "kubernetes_admissionregistration_v1alpha1_", true}, + {"k8s.io/api/admissionregistration/v1beta1", "admissionregistration.k8s.io", "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1", "kubernetes_admissionregistration_v1beta1_", true}, + {"k8s.io/api/admissionregistration/v1", "admissionregistration.k8s.io", "io.fabric8.kubernetes.api.model.admissionregistration.v1", "kubernetes_admissionregistration_v1_", true}, + {"k8s.io/api/authentication/v1", "authentication.k8s.io", "io.fabric8.kubernetes.api.model.authentication", "kubernetes_authentication_", true}, + {"k8s.io/api/authentication/v1alpha1", "authentication.k8s.io", "io.fabric8.kubernetes.api.model.authentication.v1alpha1", "kubernetes_authentication_v1alpha1_", true}, + {"k8s.io/api/authentication/v1beta1", "authentication.k8s.io", "io.fabric8.kubernetes.api.model.authentication.v1beta1", "kubernetes_authentication_v1beta1_", true}, + {"k8s.io/apimachinery/pkg/util/intstr", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_pkg_util_intstr_", false}, + {"k8s.io/apimachinery/pkg/runtime", "", "io.fabric8.kubernetes.api.model.runtime", "kubernetes_apimachinery_pkg_runtime_", false}, + {"k8s.io/apimachinery/pkg/version", "", "io.fabric8.kubernetes.api.model.version", "kubernetes_apimachinery_pkg_version_", false}, + {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, + {"k8s.io/api/authorization/v1", "authorization.k8s.io", "io.fabric8.kubernetes.api.model.authorization.v1", "kubernetes_authorization_v1_", true}, + {"k8s.io/api/authorization/v1beta1", "authorization.k8s.io", "io.fabric8.kubernetes.api.model.authorization.v1beta1", "kubernetes_authorization_v1beta1_", true}, + } - typeMap := map[reflect.Type]reflect.Type{ - reflect.TypeOf(time.Time{}): reflect.TypeOf(""), - reflect.TypeOf(struct{}{}): reflect.TypeOf(""), - } - schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, map[reflect.Type]string{}, "admissionregistration") - if err != nil { - fmt.Fprintf(os.Stderr, "An error occurred: %v", err) - return - } + typeMap := map[reflect.Type]reflect.Type{ + reflect.TypeOf(time.Time{}): reflect.TypeOf(""), + reflect.TypeOf(struct{}{}): reflect.TypeOf(""), + } + schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, map[reflect.Type]string{}, "admissionregistration") + if err != nil { + fmt.Fprintf(os.Stderr, "An error occurred: %v", err) + return + } - args := os.Args[1:] - if len(args) < 1 || args[0] != "validation" { - schema.Resources = nil - } + args := os.Args[1:] + if len(args) < 1 || args[0] != "validation" { + schema.Resources = nil + } - b, err := json.Marshal(&schema) - if err != nil { - log.Fatal(err) - } - result := string(b) - result = strings.Replace(result, "\"additionalProperty\":", "\"additionalProperties\":", -1) + b, err := json.Marshal(&schema) + if err != nil { + log.Fatal(err) + } + result := string(b) + result = strings.Replace(result, "\"additionalProperty\":", "\"additionalProperties\":", -1) - var out bytes.Buffer - err = json.Indent(&out, []byte(result), "", " ") - if err != nil { - log.Fatal(err) - } + var out bytes.Buffer + err = json.Indent(&out, []byte(result), "", " ") + if err != nil { + log.Fatal(err) + } - fmt.Println(out.String()) + fmt.Println(out.String()) } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index b20f29d3707..4983b47eb59 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -22,10 +22,6 @@ import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.admissionregistration.v1.Rule; import io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations; -import io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy; -import io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding; -import io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList; -import io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList; import io.fabric8.kubernetes.api.model.authentication.TokenRequest; import io.fabric8.kubernetes.api.model.authentication.TokenReview; import io.fabric8.kubernetes.api.model.version.Info; @@ -80,12 +76,17 @@ "V1Beta1Operation", "V1Beta1PatchType", "V1Beta1SelfSubjectReview", + "V1Beta1ValidatingAdmissionPolicy", + "V1Beta1ValidatingAdmissionPolicyBinding", + "V1Beta1ValidatingAdmissionPolicyBindingList", + "V1Beta1ValidatingAdmissionPolicyList", "V1MutatingWebhookConfiguration", "V1MutatingWebhookConfigurationList", "V1Operation", "V1PatchType", "V1Rule", "V1RuleWithOperations", + "V1SelfSubjectReview", "V1ServiceReference", "V1ValidatingWebhookConfiguration", "V1ValidatingWebhookConfigurationList", @@ -198,6 +199,14 @@ public class KubeSchema implements Editable private java.lang.String v1Beta1PatchType; @JsonProperty("V1Beta1SelfSubjectReview") private io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview; + @JsonProperty("V1Beta1ValidatingAdmissionPolicy") + private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy; + @JsonProperty("V1Beta1ValidatingAdmissionPolicyBinding") + private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding; + @JsonProperty("V1Beta1ValidatingAdmissionPolicyBindingList") + private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList; + @JsonProperty("V1Beta1ValidatingAdmissionPolicyList") + private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList; @JsonProperty("V1MutatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration; @JsonProperty("V1MutatingWebhookConfigurationList") @@ -210,6 +219,8 @@ public class KubeSchema implements Editable private Rule v1Rule; @JsonProperty("V1RuleWithOperations") private RuleWithOperations v1RuleWithOperations; + @JsonProperty("V1SelfSubjectReview") + private io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview; @JsonProperty("V1ServiceReference") private io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference; @JsonProperty("V1ValidatingWebhookConfiguration") @@ -225,13 +236,13 @@ public class KubeSchema implements Editable @JsonProperty("V1beta1SelfSubjectRulesReview") private io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview; @JsonProperty("ValidatingAdmissionPolicies") - private ValidatingAdmissionPolicy validatingAdmissionPolicies; + private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies; @JsonProperty("ValidatingAdmissionPoliciesList") - private ValidatingAdmissionPolicyList validatingAdmissionPoliciesList; + private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList; @JsonProperty("ValidatingAdmissionPolicyBinding") - private ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding; + private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding; @JsonProperty("ValidatingAdmissionPolicyBindingList") - private ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList; + private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList; @JsonProperty("ValidatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration; @JsonProperty("ValidatingWebhookConfigurationList") @@ -246,7 +257,7 @@ public class KubeSchema implements Editable public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, ValidatingAdmissionPolicy validatingAdmissionPolicies, ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -286,12 +297,17 @@ public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList b this.v1Beta1Operation = v1Beta1Operation; this.v1Beta1PatchType = v1Beta1PatchType; this.v1Beta1SelfSubjectReview = v1Beta1SelfSubjectReview; + this.v1Beta1ValidatingAdmissionPolicy = v1Beta1ValidatingAdmissionPolicy; + this.v1Beta1ValidatingAdmissionPolicyBinding = v1Beta1ValidatingAdmissionPolicyBinding; + this.v1Beta1ValidatingAdmissionPolicyBindingList = v1Beta1ValidatingAdmissionPolicyBindingList; + this.v1Beta1ValidatingAdmissionPolicyList = v1Beta1ValidatingAdmissionPolicyList; this.v1MutatingWebhookConfiguration = v1MutatingWebhookConfiguration; this.v1MutatingWebhookConfigurationList = v1MutatingWebhookConfigurationList; this.v1Operation = v1Operation; this.v1PatchType = v1PatchType; this.v1Rule = v1Rule; this.v1RuleWithOperations = v1RuleWithOperations; + this.v1SelfSubjectReview = v1SelfSubjectReview; this.v1ServiceReference = v1ServiceReference; this.v1ValidatingWebhookConfiguration = v1ValidatingWebhookConfiguration; this.v1ValidatingWebhookConfigurationList = v1ValidatingWebhookConfigurationList; @@ -687,6 +703,46 @@ public void setV1Beta1SelfSubjectReview(io.fabric8.kubernetes.api.model.authenti this.v1Beta1SelfSubjectReview = v1Beta1SelfSubjectReview; } + @JsonProperty("V1Beta1ValidatingAdmissionPolicy") + public io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy getV1Beta1ValidatingAdmissionPolicy() { + return v1Beta1ValidatingAdmissionPolicy; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicy") + public void setV1Beta1ValidatingAdmissionPolicy(io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy) { + this.v1Beta1ValidatingAdmissionPolicy = v1Beta1ValidatingAdmissionPolicy; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicyBinding") + public io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding getV1Beta1ValidatingAdmissionPolicyBinding() { + return v1Beta1ValidatingAdmissionPolicyBinding; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicyBinding") + public void setV1Beta1ValidatingAdmissionPolicyBinding(io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding) { + this.v1Beta1ValidatingAdmissionPolicyBinding = v1Beta1ValidatingAdmissionPolicyBinding; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicyBindingList") + public io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList getV1Beta1ValidatingAdmissionPolicyBindingList() { + return v1Beta1ValidatingAdmissionPolicyBindingList; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicyBindingList") + public void setV1Beta1ValidatingAdmissionPolicyBindingList(io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList) { + this.v1Beta1ValidatingAdmissionPolicyBindingList = v1Beta1ValidatingAdmissionPolicyBindingList; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicyList") + public io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList getV1Beta1ValidatingAdmissionPolicyList() { + return v1Beta1ValidatingAdmissionPolicyList; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicyList") + public void setV1Beta1ValidatingAdmissionPolicyList(io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList) { + this.v1Beta1ValidatingAdmissionPolicyList = v1Beta1ValidatingAdmissionPolicyList; + } + @JsonProperty("V1MutatingWebhookConfiguration") public io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration getV1MutatingWebhookConfiguration() { return v1MutatingWebhookConfiguration; @@ -747,6 +803,16 @@ public void setV1RuleWithOperations(RuleWithOperations v1RuleWithOperations) { this.v1RuleWithOperations = v1RuleWithOperations; } + @JsonProperty("V1SelfSubjectReview") + public io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview getV1SelfSubjectReview() { + return v1SelfSubjectReview; + } + + @JsonProperty("V1SelfSubjectReview") + public void setV1SelfSubjectReview(io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview) { + this.v1SelfSubjectReview = v1SelfSubjectReview; + } + @JsonProperty("V1ServiceReference") public io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference getV1ServiceReference() { return v1ServiceReference; @@ -818,42 +884,42 @@ public void setV1beta1SelfSubjectRulesReview(io.fabric8.kubernetes.api.model.aut } @JsonProperty("ValidatingAdmissionPolicies") - public ValidatingAdmissionPolicy getValidatingAdmissionPolicies() { + public io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy getValidatingAdmissionPolicies() { return validatingAdmissionPolicies; } @JsonProperty("ValidatingAdmissionPolicies") - public void setValidatingAdmissionPolicies(ValidatingAdmissionPolicy validatingAdmissionPolicies) { + public void setValidatingAdmissionPolicies(io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies) { this.validatingAdmissionPolicies = validatingAdmissionPolicies; } @JsonProperty("ValidatingAdmissionPoliciesList") - public ValidatingAdmissionPolicyList getValidatingAdmissionPoliciesList() { + public io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList getValidatingAdmissionPoliciesList() { return validatingAdmissionPoliciesList; } @JsonProperty("ValidatingAdmissionPoliciesList") - public void setValidatingAdmissionPoliciesList(ValidatingAdmissionPolicyList validatingAdmissionPoliciesList) { + public void setValidatingAdmissionPoliciesList(io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList) { this.validatingAdmissionPoliciesList = validatingAdmissionPoliciesList; } @JsonProperty("ValidatingAdmissionPolicyBinding") - public ValidatingAdmissionPolicyBinding getValidatingAdmissionPolicyBinding() { + public io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding getValidatingAdmissionPolicyBinding() { return validatingAdmissionPolicyBinding; } @JsonProperty("ValidatingAdmissionPolicyBinding") - public void setValidatingAdmissionPolicyBinding(ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding) { + public void setValidatingAdmissionPolicyBinding(io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding) { this.validatingAdmissionPolicyBinding = validatingAdmissionPolicyBinding; } @JsonProperty("ValidatingAdmissionPolicyBindingList") - public ValidatingAdmissionPolicyBindingList getValidatingAdmissionPolicyBindingList() { + public io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList getValidatingAdmissionPolicyBindingList() { return validatingAdmissionPolicyBindingList; } @JsonProperty("ValidatingAdmissionPolicyBindingList") - public void setValidatingAdmissionPolicyBindingList(ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList) { + public void setValidatingAdmissionPolicyBindingList(io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList) { this.validatingAdmissionPolicyBindingList = validatingAdmissionPolicyBindingList; } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 7e160bf470e..240f287fd15 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -22,10 +22,6 @@ import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.fabric8.kubernetes.api.model.admissionregistration.v1.Rule; import io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations; -import io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy; -import io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding; -import io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList; -import io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList; import io.fabric8.kubernetes.api.model.authentication.TokenRequest; import io.fabric8.kubernetes.api.model.authentication.TokenReview; import io.fabric8.kubernetes.api.model.version.Info; @@ -80,12 +76,17 @@ "V1Beta1Operation", "V1Beta1PatchType", "V1Beta1SelfSubjectReview", + "V1Beta1ValidatingAdmissionPolicy", + "V1Beta1ValidatingAdmissionPolicyBinding", + "V1Beta1ValidatingAdmissionPolicyBindingList", + "V1Beta1ValidatingAdmissionPolicyList", "V1MutatingWebhookConfiguration", "V1MutatingWebhookConfigurationList", "V1Operation", "V1PatchType", "V1Rule", "V1RuleWithOperations", + "V1SelfSubjectReview", "V1ServiceReference", "V1ValidatingWebhookConfiguration", "V1ValidatingWebhookConfigurationList", @@ -198,6 +199,14 @@ public class ValidationSchema implements Editable private java.lang.String v1Beta1PatchType; @JsonProperty("V1Beta1SelfSubjectReview") private io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview; + @JsonProperty("V1Beta1ValidatingAdmissionPolicy") + private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy; + @JsonProperty("V1Beta1ValidatingAdmissionPolicyBinding") + private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding; + @JsonProperty("V1Beta1ValidatingAdmissionPolicyBindingList") + private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList; + @JsonProperty("V1Beta1ValidatingAdmissionPolicyList") + private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList; @JsonProperty("V1MutatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration; @JsonProperty("V1MutatingWebhookConfigurationList") @@ -210,6 +219,8 @@ public class ValidationSchema implements Editable private Rule v1Rule; @JsonProperty("V1RuleWithOperations") private RuleWithOperations v1RuleWithOperations; + @JsonProperty("V1SelfSubjectReview") + private io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview; @JsonProperty("V1ServiceReference") private io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference; @JsonProperty("V1ValidatingWebhookConfiguration") @@ -225,13 +236,13 @@ public class ValidationSchema implements Editable @JsonProperty("V1beta1SelfSubjectRulesReview") private io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview; @JsonProperty("ValidatingAdmissionPolicies") - private ValidatingAdmissionPolicy validatingAdmissionPolicies; + private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies; @JsonProperty("ValidatingAdmissionPoliciesList") - private ValidatingAdmissionPolicyList validatingAdmissionPoliciesList; + private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList; @JsonProperty("ValidatingAdmissionPolicyBinding") - private ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding; + private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding; @JsonProperty("ValidatingAdmissionPolicyBindingList") - private ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList; + private io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList; @JsonProperty("ValidatingWebhookConfiguration") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration; @JsonProperty("ValidatingWebhookConfigurationList") @@ -246,7 +257,7 @@ public class ValidationSchema implements Editable public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, ValidatingAdmissionPolicy validatingAdmissionPolicies, ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -286,12 +297,17 @@ public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Kubernetes this.v1Beta1Operation = v1Beta1Operation; this.v1Beta1PatchType = v1Beta1PatchType; this.v1Beta1SelfSubjectReview = v1Beta1SelfSubjectReview; + this.v1Beta1ValidatingAdmissionPolicy = v1Beta1ValidatingAdmissionPolicy; + this.v1Beta1ValidatingAdmissionPolicyBinding = v1Beta1ValidatingAdmissionPolicyBinding; + this.v1Beta1ValidatingAdmissionPolicyBindingList = v1Beta1ValidatingAdmissionPolicyBindingList; + this.v1Beta1ValidatingAdmissionPolicyList = v1Beta1ValidatingAdmissionPolicyList; this.v1MutatingWebhookConfiguration = v1MutatingWebhookConfiguration; this.v1MutatingWebhookConfigurationList = v1MutatingWebhookConfigurationList; this.v1Operation = v1Operation; this.v1PatchType = v1PatchType; this.v1Rule = v1Rule; this.v1RuleWithOperations = v1RuleWithOperations; + this.v1SelfSubjectReview = v1SelfSubjectReview; this.v1ServiceReference = v1ServiceReference; this.v1ValidatingWebhookConfiguration = v1ValidatingWebhookConfiguration; this.v1ValidatingWebhookConfigurationList = v1ValidatingWebhookConfigurationList; @@ -687,6 +703,46 @@ public void setV1Beta1SelfSubjectReview(io.fabric8.kubernetes.api.model.authenti this.v1Beta1SelfSubjectReview = v1Beta1SelfSubjectReview; } + @JsonProperty("V1Beta1ValidatingAdmissionPolicy") + public io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy getV1Beta1ValidatingAdmissionPolicy() { + return v1Beta1ValidatingAdmissionPolicy; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicy") + public void setV1Beta1ValidatingAdmissionPolicy(io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy) { + this.v1Beta1ValidatingAdmissionPolicy = v1Beta1ValidatingAdmissionPolicy; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicyBinding") + public io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding getV1Beta1ValidatingAdmissionPolicyBinding() { + return v1Beta1ValidatingAdmissionPolicyBinding; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicyBinding") + public void setV1Beta1ValidatingAdmissionPolicyBinding(io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding) { + this.v1Beta1ValidatingAdmissionPolicyBinding = v1Beta1ValidatingAdmissionPolicyBinding; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicyBindingList") + public io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList getV1Beta1ValidatingAdmissionPolicyBindingList() { + return v1Beta1ValidatingAdmissionPolicyBindingList; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicyBindingList") + public void setV1Beta1ValidatingAdmissionPolicyBindingList(io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList) { + this.v1Beta1ValidatingAdmissionPolicyBindingList = v1Beta1ValidatingAdmissionPolicyBindingList; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicyList") + public io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList getV1Beta1ValidatingAdmissionPolicyList() { + return v1Beta1ValidatingAdmissionPolicyList; + } + + @JsonProperty("V1Beta1ValidatingAdmissionPolicyList") + public void setV1Beta1ValidatingAdmissionPolicyList(io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList) { + this.v1Beta1ValidatingAdmissionPolicyList = v1Beta1ValidatingAdmissionPolicyList; + } + @JsonProperty("V1MutatingWebhookConfiguration") public io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration getV1MutatingWebhookConfiguration() { return v1MutatingWebhookConfiguration; @@ -747,6 +803,16 @@ public void setV1RuleWithOperations(RuleWithOperations v1RuleWithOperations) { this.v1RuleWithOperations = v1RuleWithOperations; } + @JsonProperty("V1SelfSubjectReview") + public io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview getV1SelfSubjectReview() { + return v1SelfSubjectReview; + } + + @JsonProperty("V1SelfSubjectReview") + public void setV1SelfSubjectReview(io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview) { + this.v1SelfSubjectReview = v1SelfSubjectReview; + } + @JsonProperty("V1ServiceReference") public io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference getV1ServiceReference() { return v1ServiceReference; @@ -818,42 +884,42 @@ public void setV1beta1SelfSubjectRulesReview(io.fabric8.kubernetes.api.model.aut } @JsonProperty("ValidatingAdmissionPolicies") - public ValidatingAdmissionPolicy getValidatingAdmissionPolicies() { + public io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy getValidatingAdmissionPolicies() { return validatingAdmissionPolicies; } @JsonProperty("ValidatingAdmissionPolicies") - public void setValidatingAdmissionPolicies(ValidatingAdmissionPolicy validatingAdmissionPolicies) { + public void setValidatingAdmissionPolicies(io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies) { this.validatingAdmissionPolicies = validatingAdmissionPolicies; } @JsonProperty("ValidatingAdmissionPoliciesList") - public ValidatingAdmissionPolicyList getValidatingAdmissionPoliciesList() { + public io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList getValidatingAdmissionPoliciesList() { return validatingAdmissionPoliciesList; } @JsonProperty("ValidatingAdmissionPoliciesList") - public void setValidatingAdmissionPoliciesList(ValidatingAdmissionPolicyList validatingAdmissionPoliciesList) { + public void setValidatingAdmissionPoliciesList(io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList) { this.validatingAdmissionPoliciesList = validatingAdmissionPoliciesList; } @JsonProperty("ValidatingAdmissionPolicyBinding") - public ValidatingAdmissionPolicyBinding getValidatingAdmissionPolicyBinding() { + public io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding getValidatingAdmissionPolicyBinding() { return validatingAdmissionPolicyBinding; } @JsonProperty("ValidatingAdmissionPolicyBinding") - public void setValidatingAdmissionPolicyBinding(ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding) { + public void setValidatingAdmissionPolicyBinding(io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding) { this.validatingAdmissionPolicyBinding = validatingAdmissionPolicyBinding; } @JsonProperty("ValidatingAdmissionPolicyBindingList") - public ValidatingAdmissionPolicyBindingList getValidatingAdmissionPolicyBindingList() { + public io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList getValidatingAdmissionPolicyBindingList() { return validatingAdmissionPolicyBindingList; } @JsonProperty("ValidatingAdmissionPolicyBindingList") - public void setValidatingAdmissionPolicyBindingList(ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList) { + public void setValidatingAdmissionPolicyBindingList(io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList) { this.validatingAdmissionPolicyBindingList = validatingAdmissionPolicyBindingList; } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ParamRef.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ParamRef.java index 1964bbbc393..ce82c7b2989 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ParamRef.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ParamRef.java @@ -15,7 +15,6 @@ import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; @@ -36,7 +35,9 @@ "kind", "metadata", "name", - "namespace" + "namespace", + "parameterNotFoundAction", + "selector" }) @ToString @EqualsAndHashCode @@ -47,7 +48,7 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), + @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @@ -64,6 +65,10 @@ public class ParamRef implements Editable , KubernetesResource private String name; @JsonProperty("namespace") private String namespace; + @JsonProperty("parameterNotFoundAction") + private String parameterNotFoundAction; + @JsonProperty("selector") + private io.fabric8.kubernetes.api.model.LabelSelector selector; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -74,10 +79,12 @@ public class ParamRef implements Editable , KubernetesResource public ParamRef() { } - public ParamRef(String name, String namespace) { + public ParamRef(String name, String namespace, String parameterNotFoundAction, io.fabric8.kubernetes.api.model.LabelSelector selector) { super(); this.name = name; this.namespace = namespace; + this.parameterNotFoundAction = parameterNotFoundAction; + this.selector = selector; } @JsonProperty("name") @@ -100,6 +107,26 @@ public void setNamespace(String namespace) { this.namespace = namespace; } + @JsonProperty("parameterNotFoundAction") + public String getParameterNotFoundAction() { + return parameterNotFoundAction; + } + + @JsonProperty("parameterNotFoundAction") + public void setParameterNotFoundAction(String parameterNotFoundAction) { + this.parameterNotFoundAction = parameterNotFoundAction; + } + + @JsonProperty("selector") + public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + return selector; + } + + @JsonProperty("selector") + public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + this.selector = selector; + } + @JsonIgnore public ParamRefBuilder edit() { return new ParamRefBuilder(this); diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicySpec.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicySpec.java index df94f3f6b99..fa5d31a30aa 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicySpec.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/ValidatingAdmissionPolicySpec.java @@ -42,7 +42,8 @@ "matchConditions", "matchConstraints", "paramKind", - "validations" + "validations", + "variables" }) @ToString @EqualsAndHashCode @@ -81,6 +82,9 @@ public class ValidatingAdmissionPolicySpec implements Editable validations = new ArrayList(); + @JsonProperty("variables") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List variables = new ArrayList(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -91,7 +95,7 @@ public class ValidatingAdmissionPolicySpec implements Editable auditAnnotations, String failurePolicy, List matchConditions, MatchResources matchConstraints, ParamKind paramKind, List validations) { + public ValidatingAdmissionPolicySpec(List auditAnnotations, String failurePolicy, List matchConditions, MatchResources matchConstraints, ParamKind paramKind, List validations, List variables) { super(); this.auditAnnotations = auditAnnotations; this.failurePolicy = failurePolicy; @@ -99,6 +103,7 @@ public ValidatingAdmissionPolicySpec(List auditAnnotations, Str this.matchConstraints = matchConstraints; this.paramKind = paramKind; this.validations = validations; + this.variables = variables; } @JsonProperty("auditAnnotations") @@ -161,6 +166,16 @@ public void setValidations(List validations) { this.validations = validations; } + @JsonProperty("variables") + public List getVariables() { + return variables; + } + + @JsonProperty("variables") + public void setVariables(List variables) { + this.variables = variables; + } + @JsonIgnore public ValidatingAdmissionPolicySpecBuilder edit() { return new ValidatingAdmissionPolicySpecBuilder(this); diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/Variable.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/Variable.java new file mode 100644 index 00000000000..c4b4a7f5644 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1alpha1/Variable.java @@ -0,0 +1,123 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "expression", + "name" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class Variable implements Editable , KubernetesResource +{ + + @JsonProperty("expression") + private String expression; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Variable() { + } + + public Variable(String expression, String name) { + super(); + this.expression = expression; + this.name = name; + } + + @JsonProperty("expression") + public String getExpression() { + return expression; + } + + @JsonProperty("expression") + public void setExpression(String expression) { + this.expression = expression; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonIgnore + public VariableBuilder edit() { + return new VariableBuilder(this); + } + + @JsonIgnore + public VariableBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/AuditAnnotation.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/AuditAnnotation.java new file mode 100644 index 00000000000..14919e4e283 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/AuditAnnotation.java @@ -0,0 +1,123 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "key", + "valueExpression" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class AuditAnnotation implements Editable , KubernetesResource +{ + + @JsonProperty("key") + private String key; + @JsonProperty("valueExpression") + private String valueExpression; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AuditAnnotation() { + } + + public AuditAnnotation(String key, String valueExpression) { + super(); + this.key = key; + this.valueExpression = valueExpression; + } + + @JsonProperty("key") + public String getKey() { + return key; + } + + @JsonProperty("key") + public void setKey(String key) { + this.key = key; + } + + @JsonProperty("valueExpression") + public String getValueExpression() { + return valueExpression; + } + + @JsonProperty("valueExpression") + public void setValueExpression(String valueExpression) { + this.valueExpression = valueExpression; + } + + @JsonIgnore + public AuditAnnotationBuilder edit() { + return new AuditAnnotationBuilder(this); + } + + @JsonIgnore + public AuditAnnotationBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ExpressionWarning.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ExpressionWarning.java new file mode 100644 index 00000000000..4bfb6cc8561 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ExpressionWarning.java @@ -0,0 +1,123 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "fieldRef", + "warning" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ExpressionWarning implements Editable , KubernetesResource +{ + + @JsonProperty("fieldRef") + private String fieldRef; + @JsonProperty("warning") + private String warning; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ExpressionWarning() { + } + + public ExpressionWarning(String fieldRef, String warning) { + super(); + this.fieldRef = fieldRef; + this.warning = warning; + } + + @JsonProperty("fieldRef") + public String getFieldRef() { + return fieldRef; + } + + @JsonProperty("fieldRef") + public void setFieldRef(String fieldRef) { + this.fieldRef = fieldRef; + } + + @JsonProperty("warning") + public String getWarning() { + return warning; + } + + @JsonProperty("warning") + public void setWarning(String warning) { + this.warning = warning; + } + + @JsonIgnore + public ExpressionWarningBuilder edit() { + return new ExpressionWarningBuilder(this); + } + + @JsonIgnore + public ExpressionWarningBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MatchResources.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MatchResources.java new file mode 100644 index 00000000000..a220cc055b4 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MatchResources.java @@ -0,0 +1,168 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "excludeResourceRules", + "matchPolicy", + "namespaceSelector", + "objectSelector", + "resourceRules" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class MatchResources implements Editable , KubernetesResource +{ + + @JsonProperty("excludeResourceRules") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List excludeResourceRules = new ArrayList(); + @JsonProperty("matchPolicy") + private String matchPolicy; + @JsonProperty("namespaceSelector") + private io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector; + @JsonProperty("objectSelector") + private io.fabric8.kubernetes.api.model.LabelSelector objectSelector; + @JsonProperty("resourceRules") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List resourceRules = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public MatchResources() { + } + + public MatchResources(List excludeResourceRules, String matchPolicy, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector objectSelector, List resourceRules) { + super(); + this.excludeResourceRules = excludeResourceRules; + this.matchPolicy = matchPolicy; + this.namespaceSelector = namespaceSelector; + this.objectSelector = objectSelector; + this.resourceRules = resourceRules; + } + + @JsonProperty("excludeResourceRules") + public List getExcludeResourceRules() { + return excludeResourceRules; + } + + @JsonProperty("excludeResourceRules") + public void setExcludeResourceRules(List excludeResourceRules) { + this.excludeResourceRules = excludeResourceRules; + } + + @JsonProperty("matchPolicy") + public String getMatchPolicy() { + return matchPolicy; + } + + @JsonProperty("matchPolicy") + public void setMatchPolicy(String matchPolicy) { + this.matchPolicy = matchPolicy; + } + + @JsonProperty("namespaceSelector") + public io.fabric8.kubernetes.api.model.LabelSelector getNamespaceSelector() { + return namespaceSelector; + } + + @JsonProperty("namespaceSelector") + public void setNamespaceSelector(io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector) { + this.namespaceSelector = namespaceSelector; + } + + @JsonProperty("objectSelector") + public io.fabric8.kubernetes.api.model.LabelSelector getObjectSelector() { + return objectSelector; + } + + @JsonProperty("objectSelector") + public void setObjectSelector(io.fabric8.kubernetes.api.model.LabelSelector objectSelector) { + this.objectSelector = objectSelector; + } + + @JsonProperty("resourceRules") + public List getResourceRules() { + return resourceRules; + } + + @JsonProperty("resourceRules") + public void setResourceRules(List resourceRules) { + this.resourceRules = resourceRules; + } + + @JsonIgnore + public MatchResourcesBuilder edit() { + return new MatchResourcesBuilder(this); + } + + @JsonIgnore + public MatchResourcesBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/NamedRuleWithOperations.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/NamedRuleWithOperations.java new file mode 100644 index 00000000000..672e102f8f8 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/NamedRuleWithOperations.java @@ -0,0 +1,186 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "apiGroups", + "apiVersions", + "operations", + "resourceNames", + "resources", + "scope" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class NamedRuleWithOperations implements Editable , KubernetesResource +{ + + @JsonProperty("apiGroups") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List apiGroups = new ArrayList(); + @JsonProperty("apiVersions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List apiVersions = new ArrayList(); + @JsonProperty("operations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List operations = new ArrayList(); + @JsonProperty("resourceNames") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List resourceNames = new ArrayList(); + @JsonProperty("resources") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List resources = new ArrayList(); + @JsonProperty("scope") + private String scope; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NamedRuleWithOperations() { + } + + public NamedRuleWithOperations(List apiGroups, List apiVersions, List operations, List resourceNames, List resources, String scope) { + super(); + this.apiGroups = apiGroups; + this.apiVersions = apiVersions; + this.operations = operations; + this.resourceNames = resourceNames; + this.resources = resources; + this.scope = scope; + } + + @JsonProperty("apiGroups") + public List getApiGroups() { + return apiGroups; + } + + @JsonProperty("apiGroups") + public void setApiGroups(List apiGroups) { + this.apiGroups = apiGroups; + } + + @JsonProperty("apiVersions") + public List getApiVersions() { + return apiVersions; + } + + @JsonProperty("apiVersions") + public void setApiVersions(List apiVersions) { + this.apiVersions = apiVersions; + } + + @JsonProperty("operations") + public List getOperations() { + return operations; + } + + @JsonProperty("operations") + public void setOperations(List operations) { + this.operations = operations; + } + + @JsonProperty("resourceNames") + public List getResourceNames() { + return resourceNames; + } + + @JsonProperty("resourceNames") + public void setResourceNames(List resourceNames) { + this.resourceNames = resourceNames; + } + + @JsonProperty("resources") + public List getResources() { + return resources; + } + + @JsonProperty("resources") + public void setResources(List resources) { + this.resources = resources; + } + + @JsonProperty("scope") + public String getScope() { + return scope; + } + + @JsonProperty("scope") + public void setScope(String scope) { + this.scope = scope; + } + + @JsonIgnore + public NamedRuleWithOperationsBuilder edit() { + return new NamedRuleWithOperationsBuilder(this); + } + + @JsonIgnore + public NamedRuleWithOperationsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ParamKind.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ParamKind.java new file mode 100644 index 00000000000..72eb5a944d5 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ParamKind.java @@ -0,0 +1,121 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ParamKind implements Editable , KubernetesResource +{ + + @JsonProperty("apiVersion") + private String apiVersion; + @JsonProperty("kind") + private String kind; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ParamKind() { + } + + public ParamKind(String apiVersion, String kind) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + } + + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("kind") + public String getKind() { + return kind; + } + + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonIgnore + public ParamKindBuilder edit() { + return new ParamKindBuilder(this); + } + + @JsonIgnore + public ParamKindBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ParamRef.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ParamRef.java new file mode 100644 index 00000000000..0c47418d74f --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ParamRef.java @@ -0,0 +1,150 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "name", + "namespace", + "parameterNotFoundAction", + "selector" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ParamRef implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("namespace") + private String namespace; + @JsonProperty("parameterNotFoundAction") + private String parameterNotFoundAction; + @JsonProperty("selector") + private io.fabric8.kubernetes.api.model.LabelSelector selector; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ParamRef() { + } + + public ParamRef(String name, String namespace, String parameterNotFoundAction, io.fabric8.kubernetes.api.model.LabelSelector selector) { + super(); + this.name = name; + this.namespace = namespace; + this.parameterNotFoundAction = parameterNotFoundAction; + this.selector = selector; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("namespace") + public String getNamespace() { + return namespace; + } + + @JsonProperty("namespace") + public void setNamespace(String namespace) { + this.namespace = namespace; + } + + @JsonProperty("parameterNotFoundAction") + public String getParameterNotFoundAction() { + return parameterNotFoundAction; + } + + @JsonProperty("parameterNotFoundAction") + public void setParameterNotFoundAction(String parameterNotFoundAction) { + this.parameterNotFoundAction = parameterNotFoundAction; + } + + @JsonProperty("selector") + public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { + return selector; + } + + @JsonProperty("selector") + public void setSelector(io.fabric8.kubernetes.api.model.LabelSelector selector) { + this.selector = selector; + } + + @JsonIgnore + public ParamRefBuilder edit() { + return new ParamRefBuilder(this); + } + + @JsonIgnore + public ParamRefBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicyStatus.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/TypeChecking.java similarity index 76% rename from kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicyStatus.java rename to kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/TypeChecking.java index fe92991a1d7..d9ee5a37def 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicyStatus.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/TypeChecking.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.extensions; +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -14,7 +14,6 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Condition; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; @@ -38,7 +37,7 @@ "apiVersion", "kind", "metadata", - "conditions" + "expressionWarnings" }) @ToString @EqualsAndHashCode @@ -59,12 +58,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkPolicyStatus implements Editable , KubernetesResource +public class TypeChecking implements Editable , KubernetesResource { - @JsonProperty("conditions") + @JsonProperty("expressionWarnings") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList(); + private List expressionWarnings = new ArrayList(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,31 +71,31 @@ public class NetworkPolicyStatus implements Editable * No args constructor for use in serialization * */ - public NetworkPolicyStatus() { + public TypeChecking() { } - public NetworkPolicyStatus(List conditions) { + public TypeChecking(List expressionWarnings) { super(); - this.conditions = conditions; + this.expressionWarnings = expressionWarnings; } - @JsonProperty("conditions") - public List getConditions() { - return conditions; + @JsonProperty("expressionWarnings") + public List getExpressionWarnings() { + return expressionWarnings; } - @JsonProperty("conditions") - public void setConditions(List conditions) { - this.conditions = conditions; + @JsonProperty("expressionWarnings") + public void setExpressionWarnings(List expressionWarnings) { + this.expressionWarnings = expressionWarnings; } @JsonIgnore - public NetworkPolicyStatusBuilder edit() { - return new NetworkPolicyStatusBuilder(this); + public TypeCheckingBuilder edit() { + return new TypeCheckingBuilder(this); } @JsonIgnore - public NetworkPolicyStatusBuilder toBuilder() { + public TypeCheckingBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicy.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicy.java new file mode 100644 index 00000000000..6c1e82ff56f --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicy.java @@ -0,0 +1,200 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.HasMetadata; +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.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "spec", + "status" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1beta1") +@Group("admissionregistration.k8s.io") +@Generated("jsonschema2pojo") +public class ValidatingAdmissionPolicy implements Editable , HasMetadata +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "admissionregistration.k8s.io/v1beta1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "ValidatingAdmissionPolicy"; + @JsonProperty("metadata") + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + @JsonProperty("spec") + private ValidatingAdmissionPolicySpec spec; + @JsonProperty("status") + private ValidatingAdmissionPolicyStatus status; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ValidatingAdmissionPolicy() { + } + + public ValidatingAdmissionPolicy(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ValidatingAdmissionPolicySpec spec, ValidatingAdmissionPolicyStatus status) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + this.metadata = metadata; + this.spec = spec; + this.status = status; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("spec") + public ValidatingAdmissionPolicySpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(ValidatingAdmissionPolicySpec spec) { + this.spec = spec; + } + + @JsonProperty("status") + public ValidatingAdmissionPolicyStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(ValidatingAdmissionPolicyStatus status) { + this.status = status; + } + + @JsonIgnore + public ValidatingAdmissionPolicyBuilder edit() { + return new ValidatingAdmissionPolicyBuilder(this); + } + + @JsonIgnore + public ValidatingAdmissionPolicyBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBinding.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBinding.java new file mode 100644 index 00000000000..94a67bde719 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBinding.java @@ -0,0 +1,186 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.HasMetadata; +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.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "spec" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1beta1") +@Group("admissionregistration.k8s.io") +@Generated("jsonschema2pojo") +public class ValidatingAdmissionPolicyBinding implements Editable , HasMetadata +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "admissionregistration.k8s.io/v1beta1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "ValidatingAdmissionPolicyBinding"; + @JsonProperty("metadata") + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + @JsonProperty("spec") + private ValidatingAdmissionPolicyBindingSpec spec; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ValidatingAdmissionPolicyBinding() { + } + + public ValidatingAdmissionPolicyBinding(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ValidatingAdmissionPolicyBindingSpec spec) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + this.metadata = metadata; + this.spec = spec; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("spec") + public ValidatingAdmissionPolicyBindingSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(ValidatingAdmissionPolicyBindingSpec spec) { + this.spec = spec; + } + + @JsonIgnore + public ValidatingAdmissionPolicyBindingBuilder edit() { + return new ValidatingAdmissionPolicyBindingBuilder(this); + } + + @JsonIgnore + public ValidatingAdmissionPolicyBindingBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBindingList.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBindingList.java new file mode 100644 index 00000000000..2f57ec3684d --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBindingList.java @@ -0,0 +1,192 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.KubernetesResourceList; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.ListMeta; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "items" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1beta1") +@Group("admissionregistration.k8s.io") +@Generated("jsonschema2pojo") +public class ValidatingAdmissionPolicyBindingList implements Editable , KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "admissionregistration.k8s.io/v1beta1"; + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List items = new ArrayList(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "ValidatingAdmissionPolicyBindingList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ValidatingAdmissionPolicyBindingList() { + } + + public ValidatingAdmissionPolicyBindingList(String apiVersion, List items, String kind, ListMeta metadata) { + super(); + this.apiVersion = apiVersion; + this.items = items; + this.kind = kind; + this.metadata = metadata; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("items") + public List getItems() { + return items; + } + + @JsonProperty("items") + public void setItems(List items) { + this.items = items; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public ListMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ListMeta metadata) { + this.metadata = metadata; + } + + @JsonIgnore + public ValidatingAdmissionPolicyBindingListBuilder edit() { + return new ValidatingAdmissionPolicyBindingListBuilder(this); + } + + @JsonIgnore + public ValidatingAdmissionPolicyBindingListBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBindingSpec.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBindingSpec.java new file mode 100644 index 00000000000..28e222e6c82 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBindingSpec.java @@ -0,0 +1,154 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "matchResources", + "paramRef", + "policyName", + "validationActions" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ValidatingAdmissionPolicyBindingSpec implements Editable , KubernetesResource +{ + + @JsonProperty("matchResources") + private MatchResources matchResources; + @JsonProperty("paramRef") + private ParamRef paramRef; + @JsonProperty("policyName") + private String policyName; + @JsonProperty("validationActions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List validationActions = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ValidatingAdmissionPolicyBindingSpec() { + } + + public ValidatingAdmissionPolicyBindingSpec(MatchResources matchResources, ParamRef paramRef, String policyName, List validationActions) { + super(); + this.matchResources = matchResources; + this.paramRef = paramRef; + this.policyName = policyName; + this.validationActions = validationActions; + } + + @JsonProperty("matchResources") + public MatchResources getMatchResources() { + return matchResources; + } + + @JsonProperty("matchResources") + public void setMatchResources(MatchResources matchResources) { + this.matchResources = matchResources; + } + + @JsonProperty("paramRef") + public ParamRef getParamRef() { + return paramRef; + } + + @JsonProperty("paramRef") + public void setParamRef(ParamRef paramRef) { + this.paramRef = paramRef; + } + + @JsonProperty("policyName") + public String getPolicyName() { + return policyName; + } + + @JsonProperty("policyName") + public void setPolicyName(String policyName) { + this.policyName = policyName; + } + + @JsonProperty("validationActions") + public List getValidationActions() { + return validationActions; + } + + @JsonProperty("validationActions") + public void setValidationActions(List validationActions) { + this.validationActions = validationActions; + } + + @JsonIgnore + public ValidatingAdmissionPolicyBindingSpecBuilder edit() { + return new ValidatingAdmissionPolicyBindingSpecBuilder(this); + } + + @JsonIgnore + public ValidatingAdmissionPolicyBindingSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyList.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyList.java new file mode 100644 index 00000000000..c093c47f26c --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyList.java @@ -0,0 +1,192 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.KubernetesResourceList; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.ListMeta; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "items" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1beta1") +@Group("admissionregistration.k8s.io") +@Generated("jsonschema2pojo") +public class ValidatingAdmissionPolicyList implements Editable , KubernetesResource, KubernetesResourceList +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "admissionregistration.k8s.io/v1beta1"; + @JsonProperty("items") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List items = new ArrayList(); + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "ValidatingAdmissionPolicyList"; + @JsonProperty("metadata") + private ListMeta metadata; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ValidatingAdmissionPolicyList() { + } + + public ValidatingAdmissionPolicyList(String apiVersion, List items, String kind, ListMeta metadata) { + super(); + this.apiVersion = apiVersion; + this.items = items; + this.kind = kind; + this.metadata = metadata; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + @JsonProperty("items") + public List getItems() { + return items; + } + + @JsonProperty("items") + public void setItems(List items) { + this.items = items; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public ListMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(ListMeta metadata) { + this.metadata = metadata; + } + + @JsonIgnore + public ValidatingAdmissionPolicyListBuilder edit() { + return new ValidatingAdmissionPolicyListBuilder(this); + } + + @JsonIgnore + public ValidatingAdmissionPolicyListBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicySpec.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicySpec.java new file mode 100644 index 00000000000..7a8f26ff5ad --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicySpec.java @@ -0,0 +1,199 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "auditAnnotations", + "failurePolicy", + "matchConditions", + "matchConstraints", + "paramKind", + "validations", + "variables" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ValidatingAdmissionPolicySpec implements Editable , KubernetesResource +{ + + @JsonProperty("auditAnnotations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List auditAnnotations = new ArrayList(); + @JsonProperty("failurePolicy") + private String failurePolicy; + @JsonProperty("matchConditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List matchConditions = new ArrayList(); + @JsonProperty("matchConstraints") + private MatchResources matchConstraints; + @JsonProperty("paramKind") + private ParamKind paramKind; + @JsonProperty("validations") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List validations = new ArrayList(); + @JsonProperty("variables") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List variables = new ArrayList(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ValidatingAdmissionPolicySpec() { + } + + public ValidatingAdmissionPolicySpec(List auditAnnotations, String failurePolicy, List matchConditions, MatchResources matchConstraints, ParamKind paramKind, List validations, List variables) { + super(); + this.auditAnnotations = auditAnnotations; + this.failurePolicy = failurePolicy; + this.matchConditions = matchConditions; + this.matchConstraints = matchConstraints; + this.paramKind = paramKind; + this.validations = validations; + this.variables = variables; + } + + @JsonProperty("auditAnnotations") + public List getAuditAnnotations() { + return auditAnnotations; + } + + @JsonProperty("auditAnnotations") + public void setAuditAnnotations(List auditAnnotations) { + this.auditAnnotations = auditAnnotations; + } + + @JsonProperty("failurePolicy") + public String getFailurePolicy() { + return failurePolicy; + } + + @JsonProperty("failurePolicy") + public void setFailurePolicy(String failurePolicy) { + this.failurePolicy = failurePolicy; + } + + @JsonProperty("matchConditions") + public List getMatchConditions() { + return matchConditions; + } + + @JsonProperty("matchConditions") + public void setMatchConditions(List matchConditions) { + this.matchConditions = matchConditions; + } + + @JsonProperty("matchConstraints") + public MatchResources getMatchConstraints() { + return matchConstraints; + } + + @JsonProperty("matchConstraints") + public void setMatchConstraints(MatchResources matchConstraints) { + this.matchConstraints = matchConstraints; + } + + @JsonProperty("paramKind") + public ParamKind getParamKind() { + return paramKind; + } + + @JsonProperty("paramKind") + public void setParamKind(ParamKind paramKind) { + this.paramKind = paramKind; + } + + @JsonProperty("validations") + public List getValidations() { + return validations; + } + + @JsonProperty("validations") + public void setValidations(List validations) { + this.validations = validations; + } + + @JsonProperty("variables") + public List getVariables() { + return variables; + } + + @JsonProperty("variables") + public void setVariables(List variables) { + this.variables = variables; + } + + @JsonIgnore + public ValidatingAdmissionPolicySpecBuilder edit() { + return new ValidatingAdmissionPolicySpecBuilder(this); + } + + @JsonIgnore + public ValidatingAdmissionPolicySpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyStatus.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyStatus.java new file mode 100644 index 00000000000..3d262f19acd --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyStatus.java @@ -0,0 +1,141 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Condition; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "conditions", + "observedGeneration", + "typeChecking" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ValidatingAdmissionPolicyStatus implements Editable , KubernetesResource +{ + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList(); + @JsonProperty("observedGeneration") + private Long observedGeneration; + @JsonProperty("typeChecking") + private TypeChecking typeChecking; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ValidatingAdmissionPolicyStatus() { + } + + public ValidatingAdmissionPolicyStatus(List conditions, Long observedGeneration, TypeChecking typeChecking) { + super(); + this.conditions = conditions; + this.observedGeneration = observedGeneration; + this.typeChecking = typeChecking; + } + + @JsonProperty("conditions") + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("observedGeneration") + public Long getObservedGeneration() { + return observedGeneration; + } + + @JsonProperty("observedGeneration") + public void setObservedGeneration(Long observedGeneration) { + this.observedGeneration = observedGeneration; + } + + @JsonProperty("typeChecking") + public TypeChecking getTypeChecking() { + return typeChecking; + } + + @JsonProperty("typeChecking") + public void setTypeChecking(TypeChecking typeChecking) { + this.typeChecking = typeChecking; + } + + @JsonIgnore + public ValidatingAdmissionPolicyStatusBuilder edit() { + return new ValidatingAdmissionPolicyStatusBuilder(this); + } + + @JsonIgnore + public ValidatingAdmissionPolicyStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/Validation.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/Validation.java new file mode 100644 index 00000000000..0d66131a2cd --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/Validation.java @@ -0,0 +1,151 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "expression", + "message", + "messageExpression", + "reason" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class Validation implements Editable , KubernetesResource +{ + + @JsonProperty("expression") + private String expression; + @JsonProperty("message") + private String message; + @JsonProperty("messageExpression") + private String messageExpression; + @JsonProperty("reason") + private String reason; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Validation() { + } + + public Validation(String expression, String message, String messageExpression, String reason) { + super(); + this.expression = expression; + this.message = message; + this.messageExpression = messageExpression; + this.reason = reason; + } + + @JsonProperty("expression") + public String getExpression() { + return expression; + } + + @JsonProperty("expression") + public void setExpression(String expression) { + this.expression = expression; + } + + @JsonProperty("message") + public String getMessage() { + return message; + } + + @JsonProperty("message") + public void setMessage(String message) { + this.message = message; + } + + @JsonProperty("messageExpression") + public String getMessageExpression() { + return messageExpression; + } + + @JsonProperty("messageExpression") + public void setMessageExpression(String messageExpression) { + this.messageExpression = messageExpression; + } + + @JsonProperty("reason") + public String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(String reason) { + this.reason = reason; + } + + @JsonIgnore + public ValidationBuilder edit() { + return new ValidationBuilder(this); + } + + @JsonIgnore + public ValidationBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/Variable.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/Variable.java new file mode 100644 index 00000000000..d5ee47c14f7 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/Variable.java @@ -0,0 +1,123 @@ + +package io.fabric8.kubernetes.api.model.admissionregistration.v1beta1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "expression", + "name" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class Variable implements Editable , KubernetesResource +{ + + @JsonProperty("expression") + private String expression; + @JsonProperty("name") + private String name; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public Variable() { + } + + public Variable(String expression, String name) { + super(); + this.expression = expression; + this.name = name; + } + + @JsonProperty("expression") + public String getExpression() { + return expression; + } + + @JsonProperty("expression") + public void setExpression(String expression) { + this.expression = expression; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonIgnore + public VariableBuilder edit() { + return new VariableBuilder(this); + } + + @JsonIgnore + public VariableBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/SelfSubjectReview.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/SelfSubjectReview.java new file mode 100644 index 00000000000..9aff3608861 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/SelfSubjectReview.java @@ -0,0 +1,186 @@ + +package io.fabric8.kubernetes.api.model.authentication; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.HasMetadata; +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.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.fabric8.kubernetes.model.annotation.Group; +import io.fabric8.kubernetes.model.annotation.Version; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import io.sundr.transform.annotations.TemplateTransformation; +import io.sundr.transform.annotations.TemplateTransformations; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "status" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@TemplateTransformations({ + @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) +}) +@Version("v1") +@Group("authentication.k8s.io") +@Generated("jsonschema2pojo") +public class SelfSubjectReview implements Editable , HasMetadata +{ + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + private String apiVersion = "authentication.k8s.io/v1"; + /** + * + * (Required) + * + */ + @JsonProperty("kind") + private String kind = "SelfSubjectReview"; + @JsonProperty("metadata") + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + @JsonProperty("status") + private SelfSubjectReviewStatus status; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public SelfSubjectReview() { + } + + public SelfSubjectReview(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, SelfSubjectReviewStatus status) { + super(); + this.apiVersion = apiVersion; + this.kind = kind; + this.metadata = metadata; + this.status = status; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public String getApiVersion() { + return apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("apiVersion") + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public String getKind() { + return kind; + } + + /** + * + * (Required) + * + */ + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; + } + + @JsonProperty("metadata") + public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + return metadata; + } + + @JsonProperty("metadata") + public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + this.metadata = metadata; + } + + @JsonProperty("status") + public SelfSubjectReviewStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(SelfSubjectReviewStatus status) { + this.status = status; + } + + @JsonIgnore + public SelfSubjectReviewBuilder edit() { + return new SelfSubjectReviewBuilder(this); + } + + @JsonIgnore + public SelfSubjectReviewBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicyStatus.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/SelfSubjectReviewStatus.java similarity index 74% rename from kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicyStatus.java rename to kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/SelfSubjectReviewStatus.java index bd6854c1353..e881906d38f 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicyStatus.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/SelfSubjectReviewStatus.java @@ -1,9 +1,7 @@ -package io.fabric8.kubernetes.api.model.networking.v1; +package io.fabric8.kubernetes.api.model.authentication; -import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -14,7 +12,6 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Condition; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; @@ -38,7 +35,7 @@ "apiVersion", "kind", "metadata", - "conditions" + "userInfo" }) @ToString @EqualsAndHashCode @@ -59,12 +56,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkPolicyStatus implements Editable , KubernetesResource +public class SelfSubjectReviewStatus implements Editable , KubernetesResource { - @JsonProperty("conditions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList(); + @JsonProperty("userInfo") + private UserInfo userInfo; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,31 +68,31 @@ public class NetworkPolicyStatus implements Editable * No args constructor for use in serialization * */ - public NetworkPolicyStatus() { + public SelfSubjectReviewStatus() { } - public NetworkPolicyStatus(List conditions) { + public SelfSubjectReviewStatus(UserInfo userInfo) { super(); - this.conditions = conditions; + this.userInfo = userInfo; } - @JsonProperty("conditions") - public List getConditions() { - return conditions; + @JsonProperty("userInfo") + public UserInfo getUserInfo() { + return userInfo; } - @JsonProperty("conditions") - public void setConditions(List conditions) { - this.conditions = conditions; + @JsonProperty("userInfo") + public void setUserInfo(UserInfo userInfo) { + this.userInfo = userInfo; } @JsonIgnore - public NetworkPolicyStatusBuilder edit() { - return new NetworkPolicyStatusBuilder(this); + public SelfSubjectReviewStatusBuilder edit() { + return new SelfSubjectReviewStatusBuilder(this); } @JsonIgnore - public NetworkPolicyStatusBuilder toBuilder() { + public SelfSubjectReviewStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json index 2f18a670d7f..76c9dc48d63 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json @@ -817,6 +817,13 @@ }, "namespace": { "type": "string" + }, + "parameterNotFoundAction": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" } }, "additionalProperties": true, @@ -1034,6 +1041,13 @@ "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Validation", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Validation" } + }, + "variables": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Variable", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Variable" + } } }, "additionalProperties": true, @@ -1090,6 +1104,54 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1alpha1_Variable": { + "type": "object", + "properties": { + "expression": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Variable", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_AuditAnnotation": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "valueExpression": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.AuditAnnotation", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ExpressionWarning": { + "type": "object", + "properties": { + "fieldRef": { + "type": "string" + }, + "warning": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ExpressionWarning", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1beta1_MatchCondition": { "type": "object", "properties": { @@ -1106,6 +1168,43 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1beta1_MatchResources": { + "type": "object", + "properties": { + "excludeResourceRules": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_NamedRuleWithOperations", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.NamedRuleWithOperations" + } + }, + "matchPolicy": { + "type": "string" + }, + "namespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "objectSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "resourceRules": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_NamedRuleWithOperations", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.NamedRuleWithOperations" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1beta1_MutatingWebhook": { "type": "object", "properties": { @@ -1233,6 +1332,93 @@ "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration\u003e" ] }, + "kubernetes_admissionregistration_v1beta1_NamedRuleWithOperations": { + "type": "object", + "properties": { + "apiGroups": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "apiVersions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "operations": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "resourceNames": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "resources": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "scope": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.NamedRuleWithOperations", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ParamKind": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string" + }, + "kind": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamKind", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ParamRef": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "parameterNotFoundAction": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamRef", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1beta1_ServiceReference": { "type": "object", "properties": { @@ -1255,6 +1441,256 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1beta1_TypeChecking": { + "type": "object", + "properties": { + "expressionWarnings": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ExpressionWarning", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ExpressionWarning" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.TypeChecking", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicy": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "admissionregistration.k8s.io/v1beta1", + "required": true + }, + "kind": { + "type": "string", + "default": "ValidatingAdmissionPolicy", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicySpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicySpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "admissionregistration.k8s.io/v1beta1", + "required": true + }, + "kind": { + "type": "string", + "default": "ValidatingAdmissionPolicyBinding", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "admissionregistration.k8s.io/v1beta1", + "required": true + }, + "items": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding" + } + }, + "kind": { + "type": "string", + "default": "ValidatingAdmissionPolicyBindingList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding\u003e" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingSpec": { + "type": "object", + "properties": { + "matchResources": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources" + }, + "paramRef": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamRef", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamRef" + }, + "policyName": { + "type": "string" + }, + "validationActions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "admissionregistration.k8s.io/v1beta1", + "required": true + }, + "items": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy" + } + }, + "kind": { + "type": "string", + "default": "ValidatingAdmissionPolicyList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy\u003e" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicySpec": { + "type": "object", + "properties": { + "auditAnnotations": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_AuditAnnotation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.AuditAnnotation" + } + }, + "failurePolicy": { + "type": "string" + }, + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + } + }, + "matchConstraints": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources" + }, + "paramKind": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamKind", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamKind" + }, + "validations": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_Validation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Validation" + } + }, + "variables": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_Variable", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Variable" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicySpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyStatus": { + "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apimachinery_Condition", + "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" + } + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, + "typeChecking": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_TypeChecking", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.TypeChecking" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1beta1_ValidatingWebhook": { "type": "object", "properties": { @@ -1379,6 +1815,44 @@ "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration\u003e" ] }, + "kubernetes_admissionregistration_v1beta1_Validation": { + "type": "object", + "properties": { + "expression": { + "type": "string" + }, + "message": { + "type": "string" + }, + "messageExpression": { + "type": "string" + }, + "reason": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Validation", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_Variable": { + "type": "object", + "properties": { + "expression": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Variable", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1beta1_WebhookClientConfig": { "type": "object", "properties": { @@ -2269,6 +2743,48 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_authentication_SelfSubjectReview": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "authentication.k8s.io/v1", + "required": true + }, + "kind": { + "type": "string", + "default": "SelfSubjectReview", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "status": { + "$ref": "#/definitions/kubernetes_authentication_SelfSubjectReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.SelfSubjectReviewStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_authentication_SelfSubjectReviewStatus": { + "type": "object", + "properties": { + "userInfo": { + "$ref": "#/definitions/kubernetes_authentication_UserInfo", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.UserInfo" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.authentication.SelfSubjectReviewStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_authentication_TokenRequest": { "type": "object", "properties": { @@ -3412,6 +3928,22 @@ "$ref": "#/definitions/kubernetes_authentication_v1beta1_SelfSubjectReview", "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview" }, + "V1Beta1ValidatingAdmissionPolicy": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy" + }, + "V1Beta1ValidatingAdmissionPolicyBinding": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding" + }, + "V1Beta1ValidatingAdmissionPolicyBindingList": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingList", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList" + }, + "V1Beta1ValidatingAdmissionPolicyList": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyList", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList" + }, "V1MutatingWebhookConfiguration": { "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhookConfiguration", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration" @@ -3434,6 +3966,10 @@ "$ref": "#/definitions/kubernetes_admissionregistration_v1_RuleWithOperations", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations" }, + "V1SelfSubjectReview": { + "$ref": "#/definitions/kubernetes_authentication_SelfSubjectReview", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview" + }, "V1ServiceReference": { "$ref": "#/definitions/kubernetes_admissionregistration_v1_ServiceReference", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference" diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json index 306062ca9ae..83ad4fd0e9e 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json @@ -817,6 +817,13 @@ }, "namespace": { "type": "string" + }, + "parameterNotFoundAction": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" } }, "additionalProperties": true, @@ -1034,6 +1041,13 @@ "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Validation", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Validation" } + }, + "variables": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Variable", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Variable" + } } }, "additionalProperties": true, @@ -1090,6 +1104,54 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1alpha1_Variable": { + "type": "object", + "properties": { + "expression": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Variable", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_AuditAnnotation": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "valueExpression": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.AuditAnnotation", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ExpressionWarning": { + "type": "object", + "properties": { + "fieldRef": { + "type": "string" + }, + "warning": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ExpressionWarning", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1beta1_MatchCondition": { "type": "object", "properties": { @@ -1106,6 +1168,43 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_admissionregistration_v1beta1_MatchResources": { + "type": "object", + "properties": { + "excludeResourceRules": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_NamedRuleWithOperations", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.NamedRuleWithOperations" + } + }, + "matchPolicy": { + "type": "string" + }, + "namespaceSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "objectSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "resourceRules": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_NamedRuleWithOperations", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.NamedRuleWithOperations" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1beta1_MutatingWebhook": { "type": "object", "properties": { @@ -1201,7 +1300,287 @@ "io.fabric8.kubernetes.api.model.HasMetadata" ] }, - "kubernetes_admissionregistration_v1beta1_MutatingWebhookConfigurationList": { + "kubernetes_admissionregistration_v1beta1_MutatingWebhookConfigurationList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "admissionregistration.k8s.io/v1beta1", + "required": true + }, + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhookConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration" + } + }, + "kind": { + "type": "string", + "default": "MutatingWebhookConfigurationList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration\u003e" + ] + }, + "kubernetes_admissionregistration_v1beta1_NamedRuleWithOperations": { + "type": "object", + "properties": { + "apiGroups": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "apiVersions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "operations": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "resourceNames": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "resources": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "scope": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.NamedRuleWithOperations", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ParamKind": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string" + }, + "kind": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamKind", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ParamRef": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "parameterNotFoundAction": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamRef", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ServiceReference": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "namespace": { + "type": "string" + }, + "path": { + "type": "string" + }, + "port": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_TypeChecking": { + "type": "object", + "properties": { + "expressionWarnings": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ExpressionWarning", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ExpressionWarning" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.TypeChecking", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicy": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "admissionregistration.k8s.io/v1beta1", + "required": true + }, + "kind": { + "type": "string", + "default": "ValidatingAdmissionPolicy", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicySpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicySpec" + }, + "status": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "admissionregistration.k8s.io/v1beta1", + "required": true + }, + "kind": { + "type": "string", + "default": "ValidatingAdmissionPolicyBinding", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "spec": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingSpec" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingList": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "admissionregistration.k8s.io/v1beta1", + "required": true + }, + "items": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding" + } + }, + "kind": { + "type": "string", + "default": "ValidatingAdmissionPolicyBindingList", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ListMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ListMeta" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource", + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding\u003e" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingSpec": { + "type": "object", + "properties": { + "matchResources": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources" + }, + "paramRef": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamRef", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamRef" + }, + "policyName": { + "type": "string" + }, + "validationActions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingSpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyList": { "type": "object", "properties": { "apiVersion": { @@ -1211,14 +1590,15 @@ }, "items": { "type": "array", + "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhookConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy" } }, "kind": { "type": "string", - "default": "MutatingWebhookConfigurationList", + "default": "ValidatingAdmissionPolicyList", "required": true }, "metadata": { @@ -1227,30 +1607,86 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList", + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", - "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration\u003e" + "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy\u003e" ] }, - "kubernetes_admissionregistration_v1beta1_ServiceReference": { + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicySpec": { "type": "object", "properties": { - "name": { - "type": "string" + "auditAnnotations": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_AuditAnnotation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.AuditAnnotation" + } }, - "namespace": { + "failurePolicy": { "type": "string" }, - "path": { - "type": "string" + "matchConditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + } }, - "port": { - "type": "integer" + "matchConstraints": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources" + }, + "paramKind": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamKind", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamKind" + }, + "validations": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_Validation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Validation" + } + }, + "variables": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_Variable", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Variable" + } } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference", + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicySpec", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyStatus": { + "type": "object", + "properties": { + "conditions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_apimachinery_Condition", + "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" + } + }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, + "typeChecking": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_TypeChecking", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.TypeChecking" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyStatus", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -1379,6 +1815,44 @@ "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration\u003e" ] }, + "kubernetes_admissionregistration_v1beta1_Validation": { + "type": "object", + "properties": { + "expression": { + "type": "string" + }, + "message": { + "type": "string" + }, + "messageExpression": { + "type": "string" + }, + "reason": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Validation", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, + "kubernetes_admissionregistration_v1beta1_Variable": { + "type": "object", + "properties": { + "expression": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Variable", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_admissionregistration_v1beta1_WebhookClientConfig": { "type": "object", "properties": { @@ -2269,6 +2743,48 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_authentication_SelfSubjectReview": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "authentication.k8s.io/v1", + "required": true + }, + "kind": { + "type": "string", + "default": "SelfSubjectReview", + "required": true + }, + "metadata": { + "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", + "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + }, + "status": { + "$ref": "#/definitions/kubernetes_authentication_SelfSubjectReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.SelfSubjectReviewStatus" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.HasMetadata" + ] + }, + "kubernetes_authentication_SelfSubjectReviewStatus": { + "type": "object", + "properties": { + "userInfo": { + "$ref": "#/definitions/kubernetes_authentication_UserInfo", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.UserInfo" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.authentication.SelfSubjectReviewStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_authentication_TokenRequest": { "type": "object", "properties": { @@ -3412,6 +3928,22 @@ "$ref": "#/definitions/kubernetes_authentication_v1beta1_SelfSubjectReview", "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview" }, + "V1Beta1ValidatingAdmissionPolicy": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy" + }, + "V1Beta1ValidatingAdmissionPolicyBinding": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding" + }, + "V1Beta1ValidatingAdmissionPolicyBindingList": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingList", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList" + }, + "V1Beta1ValidatingAdmissionPolicyList": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyList", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList" + }, "V1MutatingWebhookConfiguration": { "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhookConfiguration", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration" @@ -3434,6 +3966,10 @@ "$ref": "#/definitions/kubernetes_admissionregistration_v1_RuleWithOperations", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations" }, + "V1SelfSubjectReview": { + "$ref": "#/definitions/kubernetes_authentication_SelfSubjectReview", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview" + }, "V1ServiceReference": { "$ref": "#/definitions/kubernetes_admissionregistration_v1_ServiceReference", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference" @@ -3586,7 +4122,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admission.k8s.io/v1beta1", + "default": "admission.k8s.io/v1", "required": true }, "kind": { @@ -3595,12 +4131,12 @@ "required": true }, "request": { - "$ref": "#/definitions/kubernetes_admission_v1beta1_AdmissionRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest" + "$ref": "#/definitions/kubernetes_admission_v1_AdmissionRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest" }, "response": { - "$ref": "#/definitions/kubernetes_admission_v1beta1_AdmissionResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse" + "$ref": "#/definitions/kubernetes_admission_v1_AdmissionResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse" } }, "additionalProperties": true @@ -4017,7 +4553,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -4030,12 +4566,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -4085,8 +4621,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_NamedRuleWithOperations", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.NamedRuleWithOperations" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_NamedRuleWithOperations", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.NamedRuleWithOperations" } }, "matchPolicy": { @@ -4104,8 +4640,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_NamedRuleWithOperations", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.NamedRuleWithOperations" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_NamedRuleWithOperations", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.NamedRuleWithOperations" } } }, @@ -4200,14 +4736,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhookConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhookConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration" } }, "kind": { @@ -4413,6 +4949,13 @@ }, "namespace": { "type": "string" + }, + "parameterNotFoundAction": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" } }, "additionalProperties": true @@ -4651,7 +5194,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authentication.k8s.io/v1beta1", + "default": "authentication.k8s.io/v1alpha1", "required": true }, "kind": { @@ -4664,8 +5207,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "status": { - "$ref": "#/definitions/kubernetes_authentication_v1beta1_SelfSubjectReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReviewStatus" + "$ref": "#/definitions/kubernetes_authentication_v1alpha1_SelfSubjectReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReviewStatus" } }, "additionalProperties": true @@ -4823,7 +5366,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1", + "default": "authorization.k8s.io/v1beta1", "required": true }, "kind": { @@ -4836,12 +5379,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -4858,7 +5401,7 @@ }, "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" }, - "groups": { + "group": { "type": "array", "javaOmitEmpty": true, "items": { @@ -4866,12 +5409,12 @@ } }, "nonResourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceAttributes" }, "resourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_ResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceAttributes" }, "uid": { "type": "string" @@ -4910,15 +5453,15 @@ "nonResourceRules": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceRule" + "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceRule" } }, "resourceRules": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceRule" + "$ref": "#/definitions/kubernetes_authorization_v1_ResourceRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceRule" } } }, @@ -5138,7 +5681,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1alpha1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -5151,12 +5694,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicySpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicySpec" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicySpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicySpec" }, "status": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyStatus" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyStatus" } }, "additionalProperties": true @@ -5165,7 +5708,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1alpha1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -5178,8 +5721,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyBindingSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingSpec" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingSpec" } }, "additionalProperties": true @@ -5188,15 +5731,15 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1alpha1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyBinding", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding" } }, "kind": { @@ -5214,12 +5757,12 @@ "validatingadmissionpolicybindingspec": { "properties": { "matchResources": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchResources", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchResources" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources" }, "paramRef": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ParamRef", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ParamRef" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamRef", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamRef" }, "policyName": { "type": "string" @@ -5297,6 +5840,13 @@ "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Validation", "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Validation" } + }, + "variables": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Variable", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Variable" + } } }, "additionalProperties": true @@ -5316,8 +5866,8 @@ "existingJavaType": "Long" }, "typeChecking": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_TypeChecking", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.TypeChecking" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_TypeChecking", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.TypeChecking" } }, "additionalProperties": true @@ -5380,7 +5930,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "kind": { @@ -5396,8 +5946,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhook" } } }, @@ -5407,14 +5957,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhookConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhookConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration" } }, "kind": { @@ -5446,6 +5996,17 @@ }, "additionalProperties": true }, + "variable": { + "properties": { + "expression": { + "type": "string" + }, + "name": { + "type": "string" + } + }, + "additionalProperties": true + }, "webhookclientconfig": { "properties": { "caBundle": { diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBindingTest.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBindingTest.java new file mode 100644 index 00000000000..a9d8988ebeb --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBindingTest.java @@ -0,0 +1,90 @@ +/** + * 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.admissionregistration.v1beta1; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.fabric8.kubernetes.api.model.LabelSelectorRequirementBuilder; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.Collections; +import java.util.Scanner; + +import static org.assertj.core.api.Assertions.assertThat; + +class ValidatingAdmissionPolicyBindingBindingTest { + private final ObjectMapper mapper = new ObjectMapper(); + + @Test + void deserializationAndSerializationShouldWorkAsExpected() throws IOException { + // Given + String originalJson = new Scanner(getClass().getResourceAsStream("/test-validatingadmissionpolicybinding-v1beta1.json")) + .useDelimiter("\\A") + .next(); + + // When + final ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding = mapper.readValue(originalJson, + ValidatingAdmissionPolicyBinding.class); + final String serializedJson = mapper.writeValueAsString(validatingAdmissionPolicyBinding); + + // Then + assertThat(serializedJson).isNotNull(); + assertThat(validatingAdmissionPolicyBinding) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "nameValue") + .hasFieldOrPropertyWithValue("spec.matchResources.namespaceSelector.matchExpressions", + Collections.singletonList(new LabelSelectorRequirementBuilder() + .withKey("keyValue") + .withOperator("operatorValue") + .withValues("valuesValue") + .build())) + .hasFieldOrPropertyWithValue("spec.policyName", "policyNameValue"); + } + + @Test + void builderShouldCreateObject() { + // Given + ValidatingAdmissionPolicyBindingBuilder validatingAdmissionPolicyBindingBuilder = new ValidatingAdmissionPolicyBindingBuilder() + .withNewMetadata().withName("demo-binding-test.example.com").endMetadata() + .withNewSpec() + .withPolicyName("demo-policy.example.com") + .withNewMatchResources() + .withNewNamespaceSelector() + .addNewMatchExpression() + .withKey("environment") + .withOperator("In") + .withValues("test") + .endMatchExpression() + .endNamespaceSelector() + .endMatchResources() + .endSpec(); + + // When + ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding = validatingAdmissionPolicyBindingBuilder.build(); + + // Then + assertThat(validatingAdmissionPolicyBinding) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "demo-binding-test.example.com") + .hasFieldOrPropertyWithValue("spec.matchResources.namespaceSelector.matchExpressions", + Collections.singletonList(new LabelSelectorRequirementBuilder() + .withKey("environment") + .withOperator("In") + .withValues("test") + .build())) + .hasFieldOrPropertyWithValue("spec.policyName", "demo-policy.example.com"); + } +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyTest.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyTest.java new file mode 100644 index 00000000000..d8e1d3bd022 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyTest.java @@ -0,0 +1,98 @@ +/** + * 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.admissionregistration.v1beta1; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.Collections; +import java.util.Scanner; + +import static org.assertj.core.api.Assertions.assertThat; + +class ValidatingAdmissionPolicyTest { + private final ObjectMapper mapper = new ObjectMapper(); + + @Test + void deserializationAndSerializationShouldWorkAsExpected() throws IOException { + // Given + String originalJson = new Scanner(getClass().getResourceAsStream("/test-validatingadmissionpolicy-v1beta1.json")) + .useDelimiter("\\A") + .next(); + + // When + final ValidatingAdmissionPolicy validatingAdmissionPolicy = mapper.readValue(originalJson, ValidatingAdmissionPolicy.class); + final String serializedJson = mapper.writeValueAsString(validatingAdmissionPolicy); + + // Then + assertThat(serializedJson).isNotNull(); + assertThat(validatingAdmissionPolicy) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "nameValue") + .hasFieldOrPropertyWithValue("spec.matchConstraints.resourceRules", + Collections.singletonList(new NamedRuleWithOperationsBuilder() + .addToApiGroups("apiGroupsValue") + .addToApiVersions("apiVersionsValue") + .addToOperations("operationsValue") + .addToResources("resourcesValue") + .addToResourceNames("resourceNamesValue") + .withScope("scopeValue") + .build())) + .hasFieldOrPropertyWithValue("spec.validations", Collections.singletonList(new ValidationBuilder() + .withExpression("expressionValue") + .withMessage("messageValue") + .withReason("reasonValue") + .withMessageExpression("messageExpressionValue") + .build())); + } + + @Test + void builderShouldCreateObject() { + // Given + ValidatingAdmissionPolicyBuilder validatingAdmissionPolicyBuilder = new ValidatingAdmissionPolicyBuilder() + .withNewMetadata().withName("demo-policy.example.com").endMetadata() + .withNewSpec() + .addNewValidation().withExpression("object.spec.replicas <= 5").endValidation() + .withNewMatchConstraints() + .addNewResourceRule() + .addToApiGroups("apps") + .addToApiVersions("v1") + .addToOperations("CREATE", "UPDATE") + .addToResources("deployments") + .endResourceRule() + .endMatchConstraints() + .endSpec(); + + // When + ValidatingAdmissionPolicy validatingAdmissionPolicy = validatingAdmissionPolicyBuilder.build(); + + // Then + assertThat(validatingAdmissionPolicy) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "demo-policy.example.com") + .hasFieldOrPropertyWithValue("spec.matchConstraints.resourceRules", + Collections.singletonList(new NamedRuleWithOperationsBuilder() + .addToApiGroups("apps") + .addToApiVersions("v1") + .addToOperations("CREATE", "UPDATE") + .addToResources("deployments") + .build())) + .hasFieldOrPropertyWithValue("spec.validations", Collections.singletonList(new ValidationBuilder() + .withExpression("object.spec.replicas <= 5") + .build())); + } +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/authentication/SelfSubjectReviewTest.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/authentication/SelfSubjectReviewTest.java new file mode 100644 index 00000000000..3044893f861 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/java/io/fabric8/kubernetes/api/model/authentication/SelfSubjectReviewTest.java @@ -0,0 +1,82 @@ +/** + * 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.authentication; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.fabric8.kubernetes.api.model.Namespaced; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.Arrays; +import java.util.Scanner; + +import static org.assertj.core.api.Assertions.assertThat; + +class SelfSubjectReviewTest { + private final ObjectMapper mapper = new ObjectMapper(); + + @Test + void isClusterScoped() { + assertThat(SelfSubjectReview.class).isNotInstanceOf(Namespaced.class); + } + + @Test + void deserializationAndSerializationShouldWorkAsExpected() throws IOException { + // Given + String originalJson = new Scanner(getClass().getResourceAsStream("/valid-selfsubjectreview-v1.json")) + .useDelimiter("\\A") + .next(); + + // When + final SelfSubjectReview selfSubjectReview = mapper.readValue(originalJson, SelfSubjectReview.class); + final String serializedJson = mapper.writeValueAsString(selfSubjectReview); + + // Then + assertThat(serializedJson).isNotNull(); + assertThat(selfSubjectReview) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "nameValue") + .hasFieldOrPropertyWithValue("status.userInfo.username", "usernameValue") + .hasFieldOrPropertyWithValue("status.userInfo.uid", "uidValue") + .hasFieldOrPropertyWithValue("status.userInfo.groups", Arrays.asList("groupsValue")); + } + + @Test + void builderShouldCreateObject() { + // Given + SelfSubjectReviewBuilder selfSubjectReviewBuilder = new SelfSubjectReviewBuilder() + .withNewMetadata() + .withName("test-selfsubjectreview") + .endMetadata() + .withNewStatus() + .withNewUserInfo() + .withUsername("kubernetes-admin") + .withUid("some-user-id") + .addToGroups("system:masters", "system:authenticated") + .endUserInfo() + .endStatus(); + // When + SelfSubjectReview selfSubjectReview = selfSubjectReviewBuilder.build(); + + // Then + assertThat(selfSubjectReview) + .isNotNull() + .hasFieldOrPropertyWithValue("metadata.name", "test-selfsubjectreview") + .hasFieldOrPropertyWithValue("status.userInfo.username", "kubernetes-admin") + .hasFieldOrPropertyWithValue("status.userInfo.uid", "some-user-id") + .hasFieldOrPropertyWithValue("status.userInfo.groups", Arrays.asList("system:masters", "system:authenticated")); + } +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/test-validatingadmissionpolicy-v1beta1.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/test-validatingadmissionpolicy-v1beta1.json new file mode 100644 index 00000000000..0106a1a27f6 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/test-validatingadmissionpolicy-v1beta1.json @@ -0,0 +1,171 @@ +{ + "kind": "ValidatingAdmissionPolicy", + "apiVersion": "admissionregistration.k8s.io/v1beta1", + "metadata": { + "name": "nameValue", + "generateName": "generateNameValue", + "namespace": "namespaceValue", + "selfLink": "selfLinkValue", + "uid": "uidValue", + "resourceVersion": "resourceVersionValue", + "generation": 7, + "creationTimestamp": "2008-01-01T01:01:01Z", + "deletionTimestamp": "2009-01-01T01:01:01Z", + "deletionGracePeriodSeconds": 10, + "labels": { + "labelsKey": "labelsValue" + }, + "annotations": { + "annotationsKey": "annotationsValue" + }, + "ownerReferences": [ + { + "apiVersion": "apiVersionValue", + "kind": "kindValue", + "name": "nameValue", + "uid": "uidValue", + "controller": true, + "blockOwnerDeletion": true + } + ], + "finalizers": [ + "finalizersValue" + ], + "managedFields": [ + { + "manager": "managerValue", + "operation": "operationValue", + "apiVersion": "apiVersionValue", + "time": "2004-01-01T01:01:01Z", + "fieldsType": "fieldsTypeValue", + "fieldsV1": {}, + "subresource": "subresourceValue" + } + ] + }, + "spec": { + "paramKind": { + "apiVersion": "apiVersionValue", + "kind": "kindValue" + }, + "matchConstraints": { + "namespaceSelector": { + "matchLabels": { + "matchLabelsKey": "matchLabelsValue" + }, + "matchExpressions": [ + { + "key": "keyValue", + "operator": "operatorValue", + "values": [ + "valuesValue" + ] + } + ] + }, + "objectSelector": { + "matchLabels": { + "matchLabelsKey": "matchLabelsValue" + }, + "matchExpressions": [ + { + "key": "keyValue", + "operator": "operatorValue", + "values": [ + "valuesValue" + ] + } + ] + }, + "resourceRules": [ + { + "resourceNames": [ + "resourceNamesValue" + ], + "operations": [ + "operationsValue" + ], + "apiGroups": [ + "apiGroupsValue" + ], + "apiVersions": [ + "apiVersionsValue" + ], + "resources": [ + "resourcesValue" + ], + "scope": "scopeValue" + } + ], + "excludeResourceRules": [ + { + "resourceNames": [ + "resourceNamesValue" + ], + "operations": [ + "operationsValue" + ], + "apiGroups": [ + "apiGroupsValue" + ], + "apiVersions": [ + "apiVersionsValue" + ], + "resources": [ + "resourcesValue" + ], + "scope": "scopeValue" + } + ], + "matchPolicy": "matchPolicyValue" + }, + "validations": [ + { + "expression": "expressionValue", + "message": "messageValue", + "reason": "reasonValue", + "messageExpression": "messageExpressionValue" + } + ], + "failurePolicy": "failurePolicyValue", + "auditAnnotations": [ + { + "key": "keyValue", + "valueExpression": "valueExpressionValue" + } + ], + "matchConditions": [ + { + "name": "nameValue", + "expression": "expressionValue" + } + ], + "variables": [ + { + "name": "nameValue", + "expression": "expressionValue" + } + ] + }, + "status": { + "observedGeneration": 1, + "typeChecking": { + "expressionWarnings": [ + { + "fieldRef": "fieldRefValue", + "warning": "warningValue" + } + ] + }, + "conditions": [ + { + "type": "typeValue", + "status": "statusValue", + "observedGeneration": 3, + "lastTransitionTime": "2004-01-01T01:01:01Z", + "reason": "reasonValue", + "message": "messageValue" + } + ] + } +} \ No newline at end of file diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/test-validatingadmissionpolicybinding-v1beta1.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/test-validatingadmissionpolicybinding-v1beta1.json new file mode 100644 index 00000000000..c63234bfc3d --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/test-validatingadmissionpolicybinding-v1beta1.json @@ -0,0 +1,142 @@ +{ + "kind": "ValidatingAdmissionPolicyBinding", + "apiVersion": "admissionregistration.k8s.io/v1beta1", + "metadata": { + "name": "nameValue", + "generateName": "generateNameValue", + "namespace": "namespaceValue", + "selfLink": "selfLinkValue", + "uid": "uidValue", + "resourceVersion": "resourceVersionValue", + "generation": 7, + "creationTimestamp": "2008-01-01T01:01:01Z", + "deletionTimestamp": "2009-01-01T01:01:01Z", + "deletionGracePeriodSeconds": 10, + "labels": { + "labelsKey": "labelsValue" + }, + "annotations": { + "annotationsKey": "annotationsValue" + }, + "ownerReferences": [ + { + "apiVersion": "apiVersionValue", + "kind": "kindValue", + "name": "nameValue", + "uid": "uidValue", + "controller": true, + "blockOwnerDeletion": true + } + ], + "finalizers": [ + "finalizersValue" + ], + "managedFields": [ + { + "manager": "managerValue", + "operation": "operationValue", + "apiVersion": "apiVersionValue", + "time": "2004-01-01T01:01:01Z", + "fieldsType": "fieldsTypeValue", + "fieldsV1": {}, + "subresource": "subresourceValue" + } + ] + }, + "spec": { + "policyName": "policyNameValue", + "paramRef": { + "name": "nameValue", + "namespace": "namespaceValue", + "selector": { + "matchLabels": { + "matchLabelsKey": "matchLabelsValue" + }, + "matchExpressions": [ + { + "key": "keyValue", + "operator": "operatorValue", + "values": [ + "valuesValue" + ] + } + ] + }, + "parameterNotFoundAction": "parameterNotFoundActionValue" + }, + "matchResources": { + "namespaceSelector": { + "matchLabels": { + "matchLabelsKey": "matchLabelsValue" + }, + "matchExpressions": [ + { + "key": "keyValue", + "operator": "operatorValue", + "values": [ + "valuesValue" + ] + } + ] + }, + "objectSelector": { + "matchLabels": { + "matchLabelsKey": "matchLabelsValue" + }, + "matchExpressions": [ + { + "key": "keyValue", + "operator": "operatorValue", + "values": [ + "valuesValue" + ] + } + ] + }, + "resourceRules": [ + { + "resourceNames": [ + "resourceNamesValue" + ], + "operations": [ + "operationsValue" + ], + "apiGroups": [ + "apiGroupsValue" + ], + "apiVersions": [ + "apiVersionsValue" + ], + "resources": [ + "resourcesValue" + ], + "scope": "scopeValue" + } + ], + "excludeResourceRules": [ + { + "resourceNames": [ + "resourceNamesValue" + ], + "operations": [ + "operationsValue" + ], + "apiGroups": [ + "apiGroupsValue" + ], + "apiVersions": [ + "apiVersionsValue" + ], + "resources": [ + "resourcesValue" + ], + "scope": "scopeValue" + } + ], + "matchPolicy": "matchPolicyValue" + }, + "validationActions": [ + "validationActionsValue" + ] + } +} diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/valid-selfsubjectreview-v1.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/valid-selfsubjectreview-v1.json new file mode 100644 index 00000000000..47162943843 --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/test/resources/valid-selfsubjectreview-v1.json @@ -0,0 +1,60 @@ +{ + "kind": "SelfSubjectReview", + "apiVersion": "authentication.k8s.io/v1", + "metadata": { + "name": "nameValue", + "generateName": "generateNameValue", + "namespace": "namespaceValue", + "selfLink": "selfLinkValue", + "uid": "uidValue", + "resourceVersion": "resourceVersionValue", + "generation": 7, + "creationTimestamp": "2008-01-01T01:01:01Z", + "deletionTimestamp": "2009-01-01T01:01:01Z", + "deletionGracePeriodSeconds": 10, + "labels": { + "labelsKey": "labelsValue" + }, + "annotations": { + "annotationsKey": "annotationsValue" + }, + "ownerReferences": [ + { + "apiVersion": "apiVersionValue", + "kind": "kindValue", + "name": "nameValue", + "uid": "uidValue", + "controller": true, + "blockOwnerDeletion": true + } + ], + "finalizers": [ + "finalizersValue" + ], + "managedFields": [ + { + "manager": "managerValue", + "operation": "operationValue", + "apiVersion": "apiVersionValue", + "time": "2004-01-01T01:01:01Z", + "fieldsType": "fieldsTypeValue", + "fieldsV1": {}, + "subresource": "subresourceValue" + } + ] + }, + "status": { + "userInfo": { + "username": "usernameValue", + "uid": "uidValue", + "groups": [ + "groupsValue" + ], + "extra": { + "extraKey": [ + "extraValue" + ] + } + } + } +} \ No newline at end of file diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/ValidationRule.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/ValidationRule.java index 4c86c854aaf..0221217c14c 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/ValidationRule.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/ValidationRule.java @@ -35,8 +35,10 @@ "apiVersion", "kind", "metadata", + "fieldPath", "message", "messageExpression", + "reason", "rule" }) @ToString @@ -61,10 +63,14 @@ public class ValidationRule implements Editable , KubernetesResource { + @JsonProperty("fieldPath") + private String fieldPath; @JsonProperty("message") private String message; @JsonProperty("messageExpression") private String messageExpression; + @JsonProperty("reason") + private String reason; @JsonProperty("rule") private String rule; @JsonIgnore @@ -77,13 +83,25 @@ public class ValidationRule implements Editable , Kuberne public ValidationRule() { } - public ValidationRule(String message, String messageExpression, String rule) { + public ValidationRule(String fieldPath, String message, String messageExpression, String reason, String rule) { super(); + this.fieldPath = fieldPath; this.message = message; this.messageExpression = messageExpression; + this.reason = reason; this.rule = rule; } + @JsonProperty("fieldPath") + public String getFieldPath() { + return fieldPath; + } + + @JsonProperty("fieldPath") + public void setFieldPath(String fieldPath) { + this.fieldPath = fieldPath; + } + @JsonProperty("message") public String getMessage() { return message; @@ -104,6 +122,16 @@ public void setMessageExpression(String messageExpression) { this.messageExpression = messageExpression; } + @JsonProperty("reason") + public String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(String reason) { + this.reason = reason; + } + @JsonProperty("rule") public String getRule() { return rule; diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/ValidationRule.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/ValidationRule.java index d55b48e7d8a..2a4fb3cbd53 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/ValidationRule.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/ValidationRule.java @@ -35,8 +35,10 @@ "apiVersion", "kind", "metadata", + "fieldPath", "message", "messageExpression", + "reason", "rule" }) @ToString @@ -61,10 +63,14 @@ public class ValidationRule implements Editable , KubernetesResource { + @JsonProperty("fieldPath") + private String fieldPath; @JsonProperty("message") private String message; @JsonProperty("messageExpression") private String messageExpression; + @JsonProperty("reason") + private String reason; @JsonProperty("rule") private String rule; @JsonIgnore @@ -77,13 +83,25 @@ public class ValidationRule implements Editable , Kuberne public ValidationRule() { } - public ValidationRule(String message, String messageExpression, String rule) { + public ValidationRule(String fieldPath, String message, String messageExpression, String reason, String rule) { super(); + this.fieldPath = fieldPath; this.message = message; this.messageExpression = messageExpression; + this.reason = reason; this.rule = rule; } + @JsonProperty("fieldPath") + public String getFieldPath() { + return fieldPath; + } + + @JsonProperty("fieldPath") + public void setFieldPath(String fieldPath) { + this.fieldPath = fieldPath; + } + @JsonProperty("message") public String getMessage() { return message; @@ -104,6 +122,16 @@ public void setMessageExpression(String messageExpression) { this.messageExpression = messageExpression; } + @JsonProperty("reason") + public String getReason() { + return reason; + } + + @JsonProperty("reason") + public void setReason(String reason) { + this.reason = reason; + } + @JsonProperty("rule") public String getRule() { return rule; diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json index 1c3e43dfe76..ec0ba51319a 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json @@ -744,12 +744,18 @@ "kubernetes_apiextensions_v1_ValidationRule": { "type": "object", "properties": { + "fieldPath": { + "type": "string" + }, "message": { "type": "string" }, "messageExpression": { "type": "string" }, + "reason": { + "type": "string" + }, "rule": { "type": "string" } @@ -1480,12 +1486,18 @@ "kubernetes_apiextensions_v1beta1_ValidationRule": { "type": "object", "properties": { + "fieldPath": { + "type": "string" + }, "message": { "type": "string" }, "messageExpression": { "type": "string" }, + "reason": { + "type": "string" + }, "rule": { "type": "string" } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json index b2e0f30912b..782a05ed548 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json @@ -744,12 +744,18 @@ "kubernetes_apiextensions_v1_ValidationRule": { "type": "object", "properties": { + "fieldPath": { + "type": "string" + }, "message": { "type": "string" }, "messageExpression": { "type": "string" }, + "reason": { + "type": "string" + }, "rule": { "type": "string" } @@ -1480,12 +1486,18 @@ "kubernetes_apiextensions_v1beta1_ValidationRule": { "type": "object", "properties": { + "fieldPath": { + "type": "string" + }, "message": { "type": "string" }, "messageExpression": { "type": "string" }, + "reason": { + "type": "string" + }, "rule": { "type": "string" } @@ -2566,13 +2578,13 @@ }, "customresourcecolumndefinition": { "properties": { - "description": { + "JSONPath": { "type": "string" }, - "format": { + "description": { "type": "string" }, - "jsonPath": { + "format": { "type": "string" }, "name": { @@ -2589,19 +2601,12 @@ }, "customresourceconversion": { "properties": { - "conversionReviewVersions": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - }, "strategy": { "type": "string" }, - "webhookClientConfig": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.WebhookClientConfig" + "webhook": { + "$ref": "#/definitions/kubernetes_apiextensions_v1_WebhookConversion", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.WebhookConversion" } }, "additionalProperties": true @@ -2610,7 +2615,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "apiextensions.k8s.io/v1", + "default": "apiextensions.k8s.io/v1beta1", "required": true }, "kind": { @@ -2623,12 +2628,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus" } }, "additionalProperties": true @@ -2768,8 +2773,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceColumnDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceColumnDefinition" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceColumnDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceColumnDefinition" } }, "deprecated": { @@ -2782,8 +2787,8 @@ "type": "string" }, "schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceValidation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceValidation" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceValidation", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceValidation" }, "served": { "type": "boolean" @@ -2792,8 +2797,8 @@ "type": "boolean" }, "subresources": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresources", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresources" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresources", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresources" } }, "additionalProperties": true @@ -2801,12 +2806,12 @@ "customresourcesubresources": { "properties": { "scale": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceScale", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceScale" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceScale", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceScale" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceStatus" } }, "additionalProperties": true @@ -2831,8 +2836,8 @@ "customresourcevalidation": { "properties": { "openAPIV3Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "additionalProperties": true @@ -3159,13 +3164,13 @@ "JSONSchemas": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "additionalProperties": true @@ -3664,12 +3669,18 @@ }, "validationrule": { "properties": { + "fieldPath": { + "type": "string" + }, "message": { "type": "string" }, "messageExpression": { "type": "string" }, + "reason": { + "type": "string" + }, "rule": { "type": "string" } @@ -3682,8 +3693,8 @@ "type": "string" }, "service": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_ServiceReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ServiceReference" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ServiceReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ServiceReference" }, "url": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json index 8dfdc868e62..f526ab0bb08 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json @@ -2467,6 +2467,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -3098,6 +3101,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -3224,6 +3230,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -3578,6 +3587,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_HostIP": { + "type": "object", + "properties": { + "ip": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.HostIP", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_HostPathVolumeSource": { "type": "object", "properties": { @@ -4736,6 +4758,13 @@ "type": "string" } }, + "allocatedResourceStatuses": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "allocatedResources": { "type": "object", "additionalProperties": { @@ -4762,9 +4791,6 @@ }, "phase": { "type": "string" - }, - "resizeStatus": { - "type": "string" } }, "additionalProperties": true, @@ -5077,6 +5103,10 @@ "kubernetes_core_PersistentVolumeStatus": { "type": "object", "properties": { + "lastPhaseTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, "message": { "type": "string" }, @@ -5388,6 +5418,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_PodResourceClaimStatus": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "resourceClaimName": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.PodResourceClaimStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_PodSchedulingGate": { "type": "object", "properties": { @@ -5683,6 +5729,14 @@ "hostIP": { "type": "string" }, + "hostIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_HostIP", + "existingJavaType": "io.fabric8.kubernetes.api.model.HostIP" + } + }, "initContainerStatuses": { "type": "array", "javaOmitEmpty": true, @@ -5720,6 +5774,14 @@ "resize": { "type": "string" }, + "resourceClaimStatuses": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_PodResourceClaimStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.PodResourceClaimStatus" + } + }, "startTime": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/validation-schema.json index 194bd6da5bf..337c5ef51ef 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/validation-schema.json @@ -2467,6 +2467,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -3098,6 +3101,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -3224,6 +3230,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -3578,6 +3587,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_HostIP": { + "type": "object", + "properties": { + "ip": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.HostIP", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_HostPathVolumeSource": { "type": "object", "properties": { @@ -4736,6 +4758,13 @@ "type": "string" } }, + "allocatedResourceStatuses": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "allocatedResources": { "type": "object", "additionalProperties": { @@ -4762,9 +4791,6 @@ }, "phase": { "type": "string" - }, - "resizeStatus": { - "type": "string" } }, "additionalProperties": true, @@ -5077,6 +5103,10 @@ "kubernetes_core_PersistentVolumeStatus": { "type": "object", "properties": { + "lastPhaseTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, "message": { "type": "string" }, @@ -5388,6 +5418,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_PodResourceClaimStatus": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "resourceClaimName": { + "type": "string" + } + }, + "additionalProperties": true, + "existingJavaType": "io.fabric8.kubernetes.api.model.PodResourceClaimStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_PodSchedulingGate": { "type": "object", "properties": { @@ -5683,6 +5729,14 @@ "hostIP": { "type": "string" }, + "hostIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_HostIP", + "existingJavaType": "io.fabric8.kubernetes.api.model.HostIP" + } + }, "initContainerStatuses": { "type": "array", "javaOmitEmpty": true, @@ -5720,6 +5774,14 @@ "resize": { "type": "string" }, + "resourceClaimStatuses": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_PodResourceClaimStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.PodResourceClaimStatus" + } + }, "startTime": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" @@ -8582,6 +8644,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -9594,6 +9659,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -9715,6 +9783,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -9990,6 +10061,14 @@ }, "additionalProperties": true }, + "hostip": { + "properties": { + "ip": { + "type": "string" + } + }, + "additionalProperties": true + }, "hostpathvolumesource": { "properties": { "path": { @@ -11312,6 +11391,13 @@ "type": "string" } }, + "allocatedResourceStatuses": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "allocatedResources": { "type": "object", "additionalProperties": { @@ -11338,9 +11424,6 @@ }, "phase": { "type": "string" - }, - "resizeStatus": { - "type": "string" } }, "additionalProperties": true @@ -11622,6 +11705,10 @@ }, "persistentvolumestatus": { "properties": { + "lastPhaseTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, "message": { "type": "string" }, @@ -11862,6 +11949,17 @@ }, "additionalProperties": true }, + "podresourceclaimstatus": { + "properties": { + "name": { + "type": "string" + }, + "resourceClaimName": { + "type": "string" + } + }, + "additionalProperties": true + }, "podschedulinggate": { "properties": { "name": { @@ -12141,6 +12239,14 @@ "hostIP": { "type": "string" }, + "hostIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_HostIP", + "existingJavaType": "io.fabric8.kubernetes.api.model.HostIP" + } + }, "initContainerStatuses": { "type": "array", "javaOmitEmpty": true, @@ -12178,6 +12284,14 @@ "resize": { "type": "string" }, + "resourceClaimStatuses": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_PodResourceClaimStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.PodResourceClaimStatus" + } + }, "startTime": { "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json index 76b80766f3d..014ce16726d 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json @@ -2766,9 +2766,12 @@ "name": { "type": "string" }, - "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + "targetAverageUtilization": { + "type": "integer" + }, + "targetAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true @@ -2779,8 +2782,8 @@ "type": "string" }, "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" }, "name": { "type": "string" @@ -2869,32 +2872,25 @@ "externalmetricsource": { "properties": { "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" } }, "additionalProperties": true }, "externalmetricstatus": { "properties": { - "currentAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" - }, - "currentValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" - }, - "metricName": { - "type": "string" + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" }, - "metricSelector": { - "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" } }, "additionalProperties": true @@ -2935,7 +2931,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v2beta2", + "default": "autoscaling/v1", "required": true }, "kind": { @@ -2948,12 +2944,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerSpec" + "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscalerSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerSpec" }, "status": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscalerStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerStatus" } }, "additionalProperties": true @@ -2961,12 +2957,12 @@ "horizontalpodautoscalerbehavior": { "properties": { "scaleDown": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" }, "scaleUp": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" } }, "additionalProperties": true @@ -2996,14 +2992,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v2beta1", + "default": "autoscaling/v2beta2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscaler", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler" } }, "kind": { @@ -3023,15 +3019,20 @@ "maxReplicas": { "type": "integer" }, + "metrics": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_MetricSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.MetricSpec" + } + }, "minReplicas": { "type": "integer" }, "scaleTargetRef": { - "$ref": "#/definitions/kubernetes_autoscaling_v1_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.CrossVersionObjectReference" - }, - "targetCPUUtilizationPercentage": { - "type": "integer" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" } }, "additionalProperties": true @@ -3041,15 +3042,15 @@ "conditions": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerCondition" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscalerCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerCondition" } }, "currentMetrics": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_MetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.MetricStatus" } }, "currentReplicas": { @@ -3089,8 +3090,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingPolicy", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingPolicy" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingPolicy" } }, "selectPolicy": { @@ -3334,24 +3335,24 @@ "metricstatus": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ContainerResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ContainerResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ContainerResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ContainerResourceMetricStatus" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ExternalMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ExternalMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ExternalMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ExternalMetricStatus" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ObjectMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ObjectMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ObjectMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ObjectMetricStatus" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_PodsMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.PodsMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_PodsMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.PodsMetricStatus" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ResourceMetricStatus" }, "type": { "type": "string" @@ -3572,13 +3573,16 @@ }, "podsmetricsource": { "properties": { - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + "metricName": { + "type": "string" }, - "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "targetAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true @@ -3627,8 +3631,8 @@ "type": "string" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobSpec.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobSpec.java index 751d17395ec..860afd4e590 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobSpec.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobSpec.java @@ -35,11 +35,14 @@ "metadata", "activeDeadlineSeconds", "backoffLimit", + "backoffLimitPerIndex", "completionMode", "completions", "manualSelector", + "maxFailedIndexes", "parallelism", "podFailurePolicy", + "podReplacementPolicy", "selector", "suspend", "template", @@ -71,16 +74,22 @@ public class JobSpec implements Editable , KubernetesResource private Long activeDeadlineSeconds; @JsonProperty("backoffLimit") private Integer backoffLimit; + @JsonProperty("backoffLimitPerIndex") + private Integer backoffLimitPerIndex; @JsonProperty("completionMode") private String completionMode; @JsonProperty("completions") private Integer completions; @JsonProperty("manualSelector") private Boolean manualSelector; + @JsonProperty("maxFailedIndexes") + private Integer maxFailedIndexes; @JsonProperty("parallelism") private Integer parallelism; @JsonProperty("podFailurePolicy") private PodFailurePolicy podFailurePolicy; + @JsonProperty("podReplacementPolicy") + private String podReplacementPolicy; @JsonProperty("selector") private io.fabric8.kubernetes.api.model.LabelSelector selector; @JsonProperty("suspend") @@ -99,15 +108,18 @@ public class JobSpec implements Editable , KubernetesResource public JobSpec() { } - public JobSpec(Long activeDeadlineSeconds, Integer backoffLimit, String completionMode, Integer completions, Boolean manualSelector, Integer parallelism, PodFailurePolicy podFailurePolicy, io.fabric8.kubernetes.api.model.LabelSelector selector, Boolean suspend, io.fabric8.kubernetes.api.model.PodTemplateSpec template, Integer ttlSecondsAfterFinished) { + public JobSpec(Long activeDeadlineSeconds, Integer backoffLimit, Integer backoffLimitPerIndex, String completionMode, Integer completions, Boolean manualSelector, Integer maxFailedIndexes, Integer parallelism, PodFailurePolicy podFailurePolicy, String podReplacementPolicy, io.fabric8.kubernetes.api.model.LabelSelector selector, Boolean suspend, io.fabric8.kubernetes.api.model.PodTemplateSpec template, Integer ttlSecondsAfterFinished) { super(); this.activeDeadlineSeconds = activeDeadlineSeconds; this.backoffLimit = backoffLimit; + this.backoffLimitPerIndex = backoffLimitPerIndex; this.completionMode = completionMode; this.completions = completions; this.manualSelector = manualSelector; + this.maxFailedIndexes = maxFailedIndexes; this.parallelism = parallelism; this.podFailurePolicy = podFailurePolicy; + this.podReplacementPolicy = podReplacementPolicy; this.selector = selector; this.suspend = suspend; this.template = template; @@ -134,6 +146,16 @@ public void setBackoffLimit(Integer backoffLimit) { this.backoffLimit = backoffLimit; } + @JsonProperty("backoffLimitPerIndex") + public Integer getBackoffLimitPerIndex() { + return backoffLimitPerIndex; + } + + @JsonProperty("backoffLimitPerIndex") + public void setBackoffLimitPerIndex(Integer backoffLimitPerIndex) { + this.backoffLimitPerIndex = backoffLimitPerIndex; + } + @JsonProperty("completionMode") public String getCompletionMode() { return completionMode; @@ -164,6 +186,16 @@ public void setManualSelector(Boolean manualSelector) { this.manualSelector = manualSelector; } + @JsonProperty("maxFailedIndexes") + public Integer getMaxFailedIndexes() { + return maxFailedIndexes; + } + + @JsonProperty("maxFailedIndexes") + public void setMaxFailedIndexes(Integer maxFailedIndexes) { + this.maxFailedIndexes = maxFailedIndexes; + } + @JsonProperty("parallelism") public Integer getParallelism() { return parallelism; @@ -184,6 +216,16 @@ public void setPodFailurePolicy(PodFailurePolicy podFailurePolicy) { this.podFailurePolicy = podFailurePolicy; } + @JsonProperty("podReplacementPolicy") + public String getPodReplacementPolicy() { + return podReplacementPolicy; + } + + @JsonProperty("podReplacementPolicy") + public void setPodReplacementPolicy(String podReplacementPolicy) { + this.podReplacementPolicy = podReplacementPolicy; + } + @JsonProperty("selector") public io.fabric8.kubernetes.api.model.LabelSelector getSelector() { return selector; diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobStatus.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobStatus.java index cda884c0e4e..14b42de2735 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobStatus.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobStatus.java @@ -42,9 +42,11 @@ "completionTime", "conditions", "failed", + "failedIndexes", "ready", "startTime", "succeeded", + "terminating", "uncountedTerminatedPods" }) @ToString @@ -80,12 +82,16 @@ public class JobStatus implements Editable , KubernetesResourc private List conditions = new ArrayList(); @JsonProperty("failed") private Integer failed; + @JsonProperty("failedIndexes") + private java.lang.String failedIndexes; @JsonProperty("ready") private Integer ready; @JsonProperty("startTime") private String startTime; @JsonProperty("succeeded") private Integer succeeded; + @JsonProperty("terminating") + private Integer terminating; @JsonProperty("uncountedTerminatedPods") private UncountedTerminatedPods uncountedTerminatedPods; @JsonIgnore @@ -98,16 +104,18 @@ public class JobStatus implements Editable , KubernetesResourc public JobStatus() { } - public JobStatus(Integer active, java.lang.String completedIndexes, String completionTime, List conditions, Integer failed, Integer ready, String startTime, Integer succeeded, UncountedTerminatedPods uncountedTerminatedPods) { + public JobStatus(Integer active, java.lang.String completedIndexes, String completionTime, List conditions, Integer failed, java.lang.String failedIndexes, Integer ready, String startTime, Integer succeeded, Integer terminating, UncountedTerminatedPods uncountedTerminatedPods) { super(); this.active = active; this.completedIndexes = completedIndexes; this.completionTime = completionTime; this.conditions = conditions; this.failed = failed; + this.failedIndexes = failedIndexes; this.ready = ready; this.startTime = startTime; this.succeeded = succeeded; + this.terminating = terminating; this.uncountedTerminatedPods = uncountedTerminatedPods; } @@ -161,6 +169,16 @@ public void setFailed(Integer failed) { this.failed = failed; } + @JsonProperty("failedIndexes") + public java.lang.String getFailedIndexes() { + return failedIndexes; + } + + @JsonProperty("failedIndexes") + public void setFailedIndexes(java.lang.String failedIndexes) { + this.failedIndexes = failedIndexes; + } + @JsonProperty("ready") public Integer getReady() { return ready; @@ -191,6 +209,16 @@ public void setSucceeded(Integer succeeded) { this.succeeded = succeeded; } + @JsonProperty("terminating") + public Integer getTerminating() { + return terminating; + } + + @JsonProperty("terminating") + public void setTerminating(Integer terminating) { + this.terminating = terminating; + } + @JsonProperty("uncountedTerminatedPods") public UncountedTerminatedPods getUncountedTerminatedPods() { return uncountedTerminatedPods; diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json index edf2ce7edbf..f9e9443df14 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json @@ -1048,6 +1048,9 @@ "backoffLimit": { "type": "integer" }, + "backoffLimitPerIndex": { + "type": "integer" + }, "completionMode": { "type": "string" }, @@ -1057,6 +1060,9 @@ "manualSelector": { "type": "boolean" }, + "maxFailedIndexes": { + "type": "integer" + }, "parallelism": { "type": "integer" }, @@ -1064,6 +1070,9 @@ "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicy", "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicy" }, + "podReplacementPolicy": { + "type": "string" + }, "selector": { "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" @@ -1109,6 +1118,9 @@ "failed": { "type": "integer" }, + "failedIndexes": { + "type": "string" + }, "ready": { "type": "integer" }, @@ -1119,6 +1131,9 @@ "succeeded": { "type": "integer" }, + "terminating": { + "type": "integer" + }, "uncountedTerminatedPods": { "$ref": "#/definitions/kubernetes_batch_v1_UncountedTerminatedPods", "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.UncountedTerminatedPods" @@ -1774,6 +1789,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -2088,6 +2106,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -2214,6 +2235,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json index 18a6376a01f..b1373aae1fd 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json @@ -1048,6 +1048,9 @@ "backoffLimit": { "type": "integer" }, + "backoffLimitPerIndex": { + "type": "integer" + }, "completionMode": { "type": "string" }, @@ -1057,6 +1060,9 @@ "manualSelector": { "type": "boolean" }, + "maxFailedIndexes": { + "type": "integer" + }, "parallelism": { "type": "integer" }, @@ -1064,6 +1070,9 @@ "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicy", "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicy" }, + "podReplacementPolicy": { + "type": "string" + }, "selector": { "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" @@ -1109,6 +1118,9 @@ "failed": { "type": "integer" }, + "failedIndexes": { + "type": "string" + }, "ready": { "type": "integer" }, @@ -1119,6 +1131,9 @@ "succeeded": { "type": "integer" }, + "terminating": { + "type": "integer" + }, "uncountedTerminatedPods": { "$ref": "#/definitions/kubernetes_batch_v1_UncountedTerminatedPods", "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.UncountedTerminatedPods" @@ -1774,6 +1789,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -2088,6 +2106,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -2214,6 +2235,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -4876,6 +4900,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -5334,6 +5361,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -5455,6 +5485,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -5913,6 +5946,9 @@ "backoffLimit": { "type": "integer" }, + "backoffLimitPerIndex": { + "type": "integer" + }, "completionMode": { "type": "string" }, @@ -5922,6 +5958,9 @@ "manualSelector": { "type": "boolean" }, + "maxFailedIndexes": { + "type": "integer" + }, "parallelism": { "type": "integer" }, @@ -5929,6 +5968,9 @@ "$ref": "#/definitions/kubernetes_batch_v1_PodFailurePolicy", "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.PodFailurePolicy" }, + "podReplacementPolicy": { + "type": "string" + }, "selector": { "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" @@ -5969,6 +6011,9 @@ "failed": { "type": "integer" }, + "failedIndexes": { + "type": "string" + }, "ready": { "type": "integer" }, @@ -5979,6 +6024,9 @@ "succeeded": { "type": "integer" }, + "terminating": { + "type": "integer" + }, "uncountedTerminatedPods": { "$ref": "#/definitions/kubernetes_batch_v1_UncountedTerminatedPods", "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.UncountedTerminatedPods" diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json index 59756ea9748..1a9da26e27e 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json @@ -1337,7 +1337,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "certificates.k8s.io/v1beta1", + "default": "certificates.k8s.io/v1", "required": true }, "kind": { @@ -1350,12 +1350,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec" }, "status": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus" } }, "additionalProperties": true @@ -1464,8 +1464,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition" } } }, diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Container.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Container.java index b15f65897a2..2460f00eec3 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Container.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Container.java @@ -39,6 +39,7 @@ "readinessProbe", "resizePolicy", "resources", + "restartPolicy", "securityContext", "startupProbe", "stdin", @@ -94,6 +95,8 @@ public class Container implements Editable , KubernetesResourc private List resizePolicy = new ArrayList(); @JsonProperty("resources") private ResourceRequirements resources; + @JsonProperty("restartPolicy") + private String restartPolicy; @JsonProperty("securityContext") private SecurityContext securityContext; @JsonProperty("startupProbe") @@ -126,7 +129,7 @@ public class Container implements Editable , KubernetesResourc public Container() { } - public Container(List args, List command, List env, List envFrom, String image, String imagePullPolicy, Lifecycle lifecycle, Probe livenessProbe, String name, List ports, Probe readinessProbe, List resizePolicy, ResourceRequirements resources, SecurityContext securityContext, Probe startupProbe, Boolean stdin, Boolean stdinOnce, String terminationMessagePath, String terminationMessagePolicy, Boolean tty, List volumeDevices, List volumeMounts, String workingDir) { + public Container(List args, List command, List env, List envFrom, String image, String imagePullPolicy, Lifecycle lifecycle, Probe livenessProbe, String name, List ports, Probe readinessProbe, List resizePolicy, ResourceRequirements resources, String restartPolicy, SecurityContext securityContext, Probe startupProbe, Boolean stdin, Boolean stdinOnce, String terminationMessagePath, String terminationMessagePolicy, Boolean tty, List volumeDevices, List volumeMounts, String workingDir) { super(); this.args = args; this.command = command; @@ -141,6 +144,7 @@ public Container(List args, List command, List env, List this.readinessProbe = readinessProbe; this.resizePolicy = resizePolicy; this.resources = resources; + this.restartPolicy = restartPolicy; this.securityContext = securityContext; this.startupProbe = startupProbe; this.stdin = stdin; @@ -283,6 +287,16 @@ public void setResources(ResourceRequirements resources) { this.resources = resources; } + @JsonProperty("restartPolicy") + public String getRestartPolicy() { + return restartPolicy; + } + + @JsonProperty("restartPolicy") + public void setRestartPolicy(String restartPolicy) { + this.restartPolicy = restartPolicy; + } + @JsonProperty("securityContext") public SecurityContext getSecurityContext() { return securityContext; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/EphemeralContainer.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/EphemeralContainer.java index 2a1682055f9..c11756369a0 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/EphemeralContainer.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/EphemeralContainer.java @@ -39,6 +39,7 @@ "readinessProbe", "resizePolicy", "resources", + "restartPolicy", "securityContext", "startupProbe", "stdin", @@ -95,6 +96,8 @@ public class EphemeralContainer implements Editable , private List resizePolicy = new ArrayList(); @JsonProperty("resources") private ResourceRequirements resources; + @JsonProperty("restartPolicy") + private String restartPolicy; @JsonProperty("securityContext") private SecurityContext securityContext; @JsonProperty("startupProbe") @@ -129,7 +132,7 @@ public class EphemeralContainer implements Editable , public EphemeralContainer() { } - public EphemeralContainer(List args, List command, List env, List envFrom, String image, String imagePullPolicy, Lifecycle lifecycle, Probe livenessProbe, String name, List ports, Probe readinessProbe, List resizePolicy, ResourceRequirements resources, SecurityContext securityContext, Probe startupProbe, Boolean stdin, Boolean stdinOnce, String targetContainerName, String terminationMessagePath, String terminationMessagePolicy, Boolean tty, List volumeDevices, List volumeMounts, String workingDir) { + public EphemeralContainer(List args, List command, List env, List envFrom, String image, String imagePullPolicy, Lifecycle lifecycle, Probe livenessProbe, String name, List ports, Probe readinessProbe, List resizePolicy, ResourceRequirements resources, String restartPolicy, SecurityContext securityContext, Probe startupProbe, Boolean stdin, Boolean stdinOnce, String targetContainerName, String terminationMessagePath, String terminationMessagePolicy, Boolean tty, List volumeDevices, List volumeMounts, String workingDir) { super(); this.args = args; this.command = command; @@ -144,6 +147,7 @@ public EphemeralContainer(List args, List command, List this.readinessProbe = readinessProbe; this.resizePolicy = resizePolicy; this.resources = resources; + this.restartPolicy = restartPolicy; this.securityContext = securityContext; this.startupProbe = startupProbe; this.stdin = stdin; @@ -287,6 +291,16 @@ public void setResources(ResourceRequirements resources) { this.resources = resources; } + @JsonProperty("restartPolicy") + public String getRestartPolicy() { + return restartPolicy; + } + + @JsonProperty("restartPolicy") + public void setRestartPolicy(String restartPolicy) { + this.restartPolicy = restartPolicy; + } + @JsonProperty("securityContext") public SecurityContext getSecurityContext() { return securityContext; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/HostIP.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/HostIP.java new file mode 100644 index 00000000000..3fb2631b9fe --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/HostIP.java @@ -0,0 +1,88 @@ + +package io.fabric8.kubernetes.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.sundr.builder.annotations.Buildable; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "ip" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") +@Generated("jsonschema2pojo") +public class HostIP implements Editable , KubernetesResource +{ + + @JsonProperty("ip") + private String ip; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HostIP() { + } + + public HostIP(String ip) { + super(); + this.ip = ip; + } + + @JsonProperty("ip") + public String getIp() { + return ip; + } + + @JsonProperty("ip") + public void setIp(String ip) { + this.ip = ip; + } + + @JsonIgnore + public HostIPBuilder edit() { + return new HostIPBuilder(this); + } + + @JsonIgnore + public HostIPBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimStatus.java index 8e0e2ac7229..34d8192bbab 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimStatus.java @@ -27,11 +27,11 @@ "kind", "metadata", "accessModes", + "allocatedResourceStatuses", "allocatedResources", "capacity", "conditions", - "phase", - "resizeStatus" + "phase" }) @ToString @EqualsAndHashCode @@ -48,6 +48,9 @@ public class PersistentVolumeClaimStatus implements Editable accessModes = new ArrayList(); + @JsonProperty("allocatedResourceStatuses") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map allocatedResourceStatuses = new LinkedHashMap(); @JsonProperty("allocatedResources") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map allocatedResources = new LinkedHashMap(); @@ -59,8 +62,6 @@ public class PersistentVolumeClaimStatus implements Editable conditions = new ArrayList(); @JsonProperty("phase") private java.lang.String phase; - @JsonProperty("resizeStatus") - private java.lang.String resizeStatus; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -71,14 +72,14 @@ public class PersistentVolumeClaimStatus implements Editable accessModes, Map allocatedResources, Map capacity, List conditions, java.lang.String phase, java.lang.String resizeStatus) { + public PersistentVolumeClaimStatus(List accessModes, Map allocatedResourceStatuses, Map allocatedResources, Map capacity, List conditions, java.lang.String phase) { super(); this.accessModes = accessModes; + this.allocatedResourceStatuses = allocatedResourceStatuses; this.allocatedResources = allocatedResources; this.capacity = capacity; this.conditions = conditions; this.phase = phase; - this.resizeStatus = resizeStatus; } @JsonProperty("accessModes") @@ -91,6 +92,16 @@ public void setAccessModes(List accessModes) { this.accessModes = accessModes; } + @JsonProperty("allocatedResourceStatuses") + public Map getAllocatedResourceStatuses() { + return allocatedResourceStatuses; + } + + @JsonProperty("allocatedResourceStatuses") + public void setAllocatedResourceStatuses(Map allocatedResourceStatuses) { + this.allocatedResourceStatuses = allocatedResourceStatuses; + } + @JsonProperty("allocatedResources") public Map getAllocatedResources() { return allocatedResources; @@ -131,16 +142,6 @@ public void setPhase(java.lang.String phase) { this.phase = phase; } - @JsonProperty("resizeStatus") - public java.lang.String getResizeStatus() { - return resizeStatus; - } - - @JsonProperty("resizeStatus") - public void setResizeStatus(java.lang.String resizeStatus) { - this.resizeStatus = resizeStatus; - } - @JsonIgnore public PersistentVolumeClaimStatusBuilder edit() { return new PersistentVolumeClaimStatusBuilder(this); diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeStatus.java index ab2b97a441c..6682df0b804 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeStatus.java @@ -24,6 +24,7 @@ "apiVersion", "kind", "metadata", + "lastPhaseTransitionTime", "message", "phase", "reason" @@ -40,14 +41,16 @@ public class PersistentVolumeStatus implements Editable , KubernetesResource { + @JsonProperty("lastPhaseTransitionTime") + private String lastPhaseTransitionTime; @JsonProperty("message") - private String message; + private java.lang.String message; @JsonProperty("phase") - private String phase; + private java.lang.String phase; @JsonProperty("reason") - private String reason; + private java.lang.String reason; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -56,40 +59,51 @@ public class PersistentVolumeStatus implements Editable getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { + public void setAdditionalProperty(java.lang.String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodResourceClaimStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodResourceClaimStatus.java new file mode 100644 index 00000000000..98d46e25e3d --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodResourceClaimStatus.java @@ -0,0 +1,102 @@ + +package io.fabric8.kubernetes.api.model; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.sundr.builder.annotations.Buildable; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "name", + "resourceClaimName" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") +@Generated("jsonschema2pojo") +public class PodResourceClaimStatus implements Editable , KubernetesResource +{ + + @JsonProperty("name") + private String name; + @JsonProperty("resourceClaimName") + private String resourceClaimName; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PodResourceClaimStatus() { + } + + public PodResourceClaimStatus(String name, String resourceClaimName) { + super(); + this.name = name; + this.resourceClaimName = resourceClaimName; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("resourceClaimName") + public String getResourceClaimName() { + return resourceClaimName; + } + + @JsonProperty("resourceClaimName") + public void setResourceClaimName(String resourceClaimName) { + this.resourceClaimName = resourceClaimName; + } + + @JsonIgnore + public PodResourceClaimStatusBuilder edit() { + return new PodResourceClaimStatusBuilder(this); + } + + @JsonIgnore + public PodResourceClaimStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodStatus.java index e8d010dba5b..9d7fd270ee4 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodStatus.java @@ -30,6 +30,7 @@ "containerStatuses", "ephemeralContainerStatuses", "hostIP", + "hostIPs", "initContainerStatuses", "message", "nominatedNodeName", @@ -39,6 +40,7 @@ "qosClass", "reason", "resize", + "resourceClaimStatuses", "startTime" }) @ToString @@ -64,6 +66,9 @@ public class PodStatus implements Editable , KubernetesResourc private List ephemeralContainerStatuses = new ArrayList(); @JsonProperty("hostIP") private java.lang.String hostIP; + @JsonProperty("hostIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List hostIPs = new ArrayList(); @JsonProperty("initContainerStatuses") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List initContainerStatuses = new ArrayList(); @@ -84,6 +89,9 @@ public class PodStatus implements Editable , KubernetesResourc private java.lang.String reason; @JsonProperty("resize") private java.lang.String resize; + @JsonProperty("resourceClaimStatuses") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List resourceClaimStatuses = new ArrayList(); @JsonProperty("startTime") private String startTime; @JsonIgnore @@ -96,12 +104,13 @@ public class PodStatus implements Editable , KubernetesResourc public PodStatus() { } - public PodStatus(List conditions, List containerStatuses, List ephemeralContainerStatuses, java.lang.String hostIP, List initContainerStatuses, java.lang.String message, java.lang.String nominatedNodeName, java.lang.String phase, java.lang.String podIP, List podIPs, java.lang.String qosClass, java.lang.String reason, java.lang.String resize, String startTime) { + public PodStatus(List conditions, List containerStatuses, List ephemeralContainerStatuses, java.lang.String hostIP, List hostIPs, List initContainerStatuses, java.lang.String message, java.lang.String nominatedNodeName, java.lang.String phase, java.lang.String podIP, List podIPs, java.lang.String qosClass, java.lang.String reason, java.lang.String resize, List resourceClaimStatuses, String startTime) { super(); this.conditions = conditions; this.containerStatuses = containerStatuses; this.ephemeralContainerStatuses = ephemeralContainerStatuses; this.hostIP = hostIP; + this.hostIPs = hostIPs; this.initContainerStatuses = initContainerStatuses; this.message = message; this.nominatedNodeName = nominatedNodeName; @@ -111,6 +120,7 @@ public PodStatus(List conditions, List containerS this.qosClass = qosClass; this.reason = reason; this.resize = resize; + this.resourceClaimStatuses = resourceClaimStatuses; this.startTime = startTime; } @@ -154,6 +164,16 @@ public void setHostIP(java.lang.String hostIP) { this.hostIP = hostIP; } + @JsonProperty("hostIPs") + public List getHostIPs() { + return hostIPs; + } + + @JsonProperty("hostIPs") + public void setHostIPs(List hostIPs) { + this.hostIPs = hostIPs; + } + @JsonProperty("initContainerStatuses") public List getInitContainerStatuses() { return initContainerStatuses; @@ -244,6 +264,16 @@ public void setResize(java.lang.String resize) { this.resize = resize; } + @JsonProperty("resourceClaimStatuses") + public List getResourceClaimStatuses() { + return resourceClaimStatuses; + } + + @JsonProperty("resourceClaimStatuses") + public void setResourceClaimStatuses(List resourceClaimStatuses) { + this.resourceClaimStatuses = resourceClaimStatuses; + } + @JsonProperty("startTime") public String getStartTime() { return startTime; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json index f9b8072ae97..0ff04ee9910 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json @@ -2258,6 +2258,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -2889,6 +2892,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -3015,6 +3021,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -3508,6 +3517,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_HostIP": { + "type": "object", + "properties": { + "ip": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.HostIP", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_HostPathVolumeSource": { "type": "object", "properties": { @@ -4666,6 +4688,13 @@ "type": "string" } }, + "allocatedResourceStatuses": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "allocatedResources": { "type": "object", "additionalProperties": { @@ -4692,9 +4721,6 @@ }, "phase": { "type": "string" - }, - "resizeStatus": { - "type": "string" } }, "additionalProperties": true, @@ -5007,6 +5033,10 @@ "kubernetes_core_PersistentVolumeStatus": { "type": "object", "properties": { + "lastPhaseTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", + "existingJavaType": "String" + }, "message": { "type": "string" }, @@ -5359,6 +5389,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_PodResourceClaimStatus": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "resourceClaimName": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.PodResourceClaimStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_PodSchedulingGate": { "type": "object", "properties": { @@ -5654,6 +5700,14 @@ "hostIP": { "type": "string" }, + "hostIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_HostIP", + "existingJavaType": "io.fabric8.kubernetes.api.model.HostIP" + } + }, "initContainerStatuses": { "type": "array", "javaOmitEmpty": true, @@ -5691,6 +5745,14 @@ "resize": { "type": "string" }, + "resourceClaimStatuses": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_PodResourceClaimStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.PodResourceClaimStatus" + } + }, "startTime": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json index 4089a2a0345..18758bdb790 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json @@ -2258,6 +2258,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -2889,6 +2892,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -3015,6 +3021,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -3508,6 +3517,19 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_HostIP": { + "type": "object", + "properties": { + "ip": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.HostIP", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_HostPathVolumeSource": { "type": "object", "properties": { @@ -4666,6 +4688,13 @@ "type": "string" } }, + "allocatedResourceStatuses": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "allocatedResources": { "type": "object", "additionalProperties": { @@ -4692,9 +4721,6 @@ }, "phase": { "type": "string" - }, - "resizeStatus": { - "type": "string" } }, "additionalProperties": true, @@ -5007,6 +5033,10 @@ "kubernetes_core_PersistentVolumeStatus": { "type": "object", "properties": { + "lastPhaseTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", + "existingJavaType": "String" + }, "message": { "type": "string" }, @@ -5359,6 +5389,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_core_PodResourceClaimStatus": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "resourceClaimName": { + "type": "string" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.PodResourceClaimStatus", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_core_PodSchedulingGate": { "type": "object", "properties": { @@ -5654,6 +5700,14 @@ "hostIP": { "type": "string" }, + "hostIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_HostIP", + "existingJavaType": "io.fabric8.kubernetes.api.model.HostIP" + } + }, "initContainerStatuses": { "type": "array", "javaOmitEmpty": true, @@ -5691,6 +5745,14 @@ "resize": { "type": "string" }, + "resourceClaimStatuses": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_PodResourceClaimStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.PodResourceClaimStatus" + } + }, "startTime": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", "existingJavaType": "String" @@ -8984,6 +9046,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -9658,6 +9723,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -9779,6 +9847,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -10254,6 +10325,14 @@ }, "additionalProperties": true }, + "hostip": { + "properties": { + "ip": { + "type": "string" + } + }, + "additionalProperties": true + }, "hostpathvolumesource": { "properties": { "path": { @@ -11631,6 +11710,13 @@ "type": "string" } }, + "allocatedResourceStatuses": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "allocatedResources": { "type": "object", "additionalProperties": { @@ -11657,9 +11743,6 @@ }, "phase": { "type": "string" - }, - "resizeStatus": { - "type": "string" } }, "additionalProperties": true @@ -11941,6 +12024,10 @@ }, "persistentvolumestatus": { "properties": { + "lastPhaseTransitionTime": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", + "existingJavaType": "String" + }, "message": { "type": "string" }, @@ -12217,6 +12304,17 @@ }, "additionalProperties": true }, + "podresourceclaimstatus": { + "properties": { + "name": { + "type": "string" + }, + "resourceClaimName": { + "type": "string" + } + }, + "additionalProperties": true + }, "podschedulinggate": { "properties": { "name": { @@ -12496,6 +12594,14 @@ "hostIP": { "type": "string" }, + "hostIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_HostIP", + "existingJavaType": "io.fabric8.kubernetes.api.model.HostIP" + } + }, "initContainerStatuses": { "type": "array", "javaOmitEmpty": true, @@ -12533,6 +12639,14 @@ "resize": { "type": "string" }, + "resourceClaimStatuses": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_core_PodResourceClaimStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.PodResourceClaimStatus" + } + }, "startTime": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", "existingJavaType": "String" diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json index 6c0776ce768..4475268973d 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json @@ -1440,8 +1440,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_discovery_v1_ForZone", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.ForZone" + "$ref": "#/definitions/kubernetes_discovery_v1beta1_ForZone", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.ForZone" } } }, @@ -1473,14 +1473,14 @@ }, "apiVersion": { "type": "string", - "default": "discovery.k8s.io/v1beta1", + "default": "discovery.k8s.io/v1", "required": true }, "endpoints": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_Endpoint", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.Endpoint" + "$ref": "#/definitions/kubernetes_discovery_v1_Endpoint", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.Endpoint" } }, "kind": { @@ -1495,8 +1495,8 @@ "ports": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointPort", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointPort" + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointPort", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointPort" } } }, diff --git a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json index 0f8c704fbb8..ae3eed97814 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json @@ -1351,14 +1351,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "events.k8s.io/v1beta1", + "default": "events.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_events_v1beta1_Event", - "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1beta1.Event" + "$ref": "#/definitions/kubernetes_events_v1_Event", + "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1.Event" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicy.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicy.java index c5fad285f2d..6cedfbf0b06 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicy.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicy.java @@ -39,8 +39,7 @@ "apiVersion", "kind", "metadata", - "spec", - "status" + "spec" }) @ToString @EqualsAndHashCode @@ -87,8 +86,6 @@ public class NetworkPolicy implements Editable , HasMetada private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private NetworkPolicySpec spec; - @JsonProperty("status") - private NetworkPolicyStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -99,13 +96,12 @@ public class NetworkPolicy implements Editable , HasMetada public NetworkPolicy() { } - public NetworkPolicy(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, NetworkPolicySpec spec, NetworkPolicyStatus status) { + public NetworkPolicy(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, NetworkPolicySpec spec) { super(); this.apiVersion = apiVersion; this.kind = kind; this.metadata = metadata; this.spec = spec; - this.status = status; } /** @@ -168,16 +164,6 @@ public void setSpec(NetworkPolicySpec spec) { this.spec = spec; } - @JsonProperty("status") - public NetworkPolicyStatus getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(NetworkPolicyStatus status) { - this.status = status; - } - @JsonIgnore public NetworkPolicyBuilder edit() { return new NetworkPolicyBuilder(this); diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/kube-schema.json index ca8f2a4f97d..680f2d2b3c6 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/kube-schema.json @@ -85,36 +85,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Condition": { - "type": "object", - "properties": { - "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" - }, - "message": { - "type": "string" - }, - "observedGeneration": { - "type": "integer", - "existingJavaType": "Long" - }, - "reason": { - "type": "string" - }, - "status": { - "type": "string" - }, - "type": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.Condition", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_CreateOptions": { "type": "object", "properties": { @@ -1224,6 +1194,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1538,6 +1511,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1664,6 +1640,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -4584,10 +4563,6 @@ "spec": { "$ref": "#/definitions/kubernetes_extensions_NetworkPolicySpec", "existingJavaType": "io.fabric8.kubernetes.api.model.extensions.NetworkPolicySpec" - }, - "status": { - "$ref": "#/definitions/kubernetes_extensions_NetworkPolicyStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.extensions.NetworkPolicyStatus" } }, "additionalProperties": true, @@ -4760,24 +4735,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_extensions_NetworkPolicyStatus": { - "type": "object", - "properties": { - "conditions": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/kubernetes_apimachinery_Condition", - "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" - } - } - }, - "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.extensions.NetworkPolicyStatus", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_extensions_ReplicaSet": { "type": "object", "properties": { diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/validation-schema.json index 337e168c89e..0b68ba867e6 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/validation-schema.json @@ -85,36 +85,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Condition": { - "type": "object", - "properties": { - "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" - }, - "message": { - "type": "string" - }, - "observedGeneration": { - "type": "integer", - "existingJavaType": "Long" - }, - "reason": { - "type": "string" - }, - "status": { - "type": "string" - }, - "type": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.Condition", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_CreateOptions": { "type": "object", "properties": { @@ -1224,6 +1194,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1538,6 +1511,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1664,6 +1640,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -4584,10 +4563,6 @@ "spec": { "$ref": "#/definitions/kubernetes_extensions_NetworkPolicySpec", "existingJavaType": "io.fabric8.kubernetes.api.model.extensions.NetworkPolicySpec" - }, - "status": { - "$ref": "#/definitions/kubernetes_extensions_NetworkPolicyStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.extensions.NetworkPolicyStatus" } }, "additionalProperties": true, @@ -4760,24 +4735,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_extensions_NetworkPolicyStatus": { - "type": "object", - "properties": { - "conditions": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/kubernetes_apimachinery_Condition", - "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" - } - } - }, - "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.extensions.NetworkPolicyStatus", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_extensions_ReplicaSet": { "type": "object", "properties": { @@ -5304,31 +5261,6 @@ }, "additionalProperties": true }, - "condition": { - "properties": { - "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" - }, - "message": { - "type": "string" - }, - "observedGeneration": { - "type": "integer", - "existingJavaType": "Long" - }, - "reason": { - "type": "string" - }, - "status": { - "type": "string" - }, - "type": { - "type": "string" - } - }, - "additionalProperties": true - }, "configmapenvsource": { "properties": { "name": { @@ -5470,6 +5402,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -6167,6 +6102,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -6288,6 +6226,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -7117,10 +7058,6 @@ "spec": { "$ref": "#/definitions/kubernetes_extensions_NetworkPolicySpec", "existingJavaType": "io.fabric8.kubernetes.api.model.extensions.NetworkPolicySpec" - }, - "status": { - "$ref": "#/definitions/kubernetes_extensions_NetworkPolicyStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.extensions.NetworkPolicyStatus" } }, "additionalProperties": true @@ -7257,19 +7194,6 @@ }, "additionalProperties": true }, - "networkpolicystatus": { - "properties": { - "conditions": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/kubernetes_apimachinery_Condition", - "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" - } - } - }, - "additionalProperties": true - }, "nfsvolumesource": { "properties": { "path": { diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1alpha1/ExemptPriorityLevelConfiguration.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1alpha1/ExemptPriorityLevelConfiguration.java new file mode 100644 index 00000000000..1a612d7367d --- /dev/null +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1alpha1/ExemptPriorityLevelConfiguration.java @@ -0,0 +1,123 @@ + +package io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1; + +import java.util.LinkedHashMap; +import java.util.Map; +import javax.annotation.Generated; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.fabric8.kubernetes.api.builder.Editable; +import io.fabric8.kubernetes.api.model.Container; +import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; +import io.fabric8.kubernetes.api.model.PodTemplateSpec; +import io.fabric8.kubernetes.api.model.ResourceRequirements; +import io.sundr.builder.annotations.Buildable; +import io.sundr.builder.annotations.BuildableReference; +import lombok.EqualsAndHashCode; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiVersion", + "kind", + "metadata", + "lendablePercent", + "nominalConcurrencyShares" +}) +@ToString +@EqualsAndHashCode +@Setter +@Accessors(prefix = { + "_", + "" +}) +@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { + @BuildableReference(ObjectMeta.class), + @BuildableReference(LabelSelector.class), + @BuildableReference(Container.class), + @BuildableReference(PodTemplateSpec.class), + @BuildableReference(ResourceRequirements.class), + @BuildableReference(IntOrString.class), + @BuildableReference(ObjectReference.class), + @BuildableReference(LocalObjectReference.class), + @BuildableReference(PersistentVolumeClaim.class) +}) +@Generated("jsonschema2pojo") +public class ExemptPriorityLevelConfiguration implements Editable , KubernetesResource +{ + + @JsonProperty("lendablePercent") + private Integer lendablePercent; + @JsonProperty("nominalConcurrencyShares") + private Integer nominalConcurrencyShares; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ExemptPriorityLevelConfiguration() { + } + + public ExemptPriorityLevelConfiguration(Integer lendablePercent, Integer nominalConcurrencyShares) { + super(); + this.lendablePercent = lendablePercent; + this.nominalConcurrencyShares = nominalConcurrencyShares; + } + + @JsonProperty("lendablePercent") + public Integer getLendablePercent() { + return lendablePercent; + } + + @JsonProperty("lendablePercent") + public void setLendablePercent(Integer lendablePercent) { + this.lendablePercent = lendablePercent; + } + + @JsonProperty("nominalConcurrencyShares") + public Integer getNominalConcurrencyShares() { + return nominalConcurrencyShares; + } + + @JsonProperty("nominalConcurrencyShares") + public void setNominalConcurrencyShares(Integer nominalConcurrencyShares) { + this.nominalConcurrencyShares = nominalConcurrencyShares; + } + + @JsonIgnore + public ExemptPriorityLevelConfigurationBuilder edit() { + return new ExemptPriorityLevelConfigurationBuilder(this); + } + + @JsonIgnore + public ExemptPriorityLevelConfigurationBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1alpha1/PriorityLevelConfigurationSpec.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1alpha1/PriorityLevelConfigurationSpec.java index 3536c4f9cd6..bebc08c0389 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1alpha1/PriorityLevelConfigurationSpec.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1alpha1/PriorityLevelConfigurationSpec.java @@ -35,6 +35,7 @@ "apiVersion", "kind", "metadata", + "exempt", "limited", "type" }) @@ -60,6 +61,8 @@ public class PriorityLevelConfigurationSpec implements Editable , KubernetesResource { + @JsonProperty("exempt") + private ExemptPriorityLevelConfiguration exempt; @JsonProperty("limited") private LimitedPriorityLevelConfiguration limited; @JsonProperty("type") @@ -74,12 +77,23 @@ public class PriorityLevelConfigurationSpec implements Editable , KubernetesResource +{ + + @JsonProperty("lendablePercent") + private Integer lendablePercent; + @JsonProperty("nominalConcurrencyShares") + private Integer nominalConcurrencyShares; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ExemptPriorityLevelConfiguration() { + } + + public ExemptPriorityLevelConfiguration(Integer lendablePercent, Integer nominalConcurrencyShares) { + super(); + this.lendablePercent = lendablePercent; + this.nominalConcurrencyShares = nominalConcurrencyShares; + } + + @JsonProperty("lendablePercent") + public Integer getLendablePercent() { + return lendablePercent; + } + + @JsonProperty("lendablePercent") + public void setLendablePercent(Integer lendablePercent) { + this.lendablePercent = lendablePercent; + } + + @JsonProperty("nominalConcurrencyShares") + public Integer getNominalConcurrencyShares() { + return nominalConcurrencyShares; + } + + @JsonProperty("nominalConcurrencyShares") + public void setNominalConcurrencyShares(Integer nominalConcurrencyShares) { + this.nominalConcurrencyShares = nominalConcurrencyShares; + } + + @JsonIgnore + public ExemptPriorityLevelConfigurationBuilder edit() { + return new ExemptPriorityLevelConfigurationBuilder(this); + } + + @JsonIgnore + public ExemptPriorityLevelConfigurationBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfigurationSpec.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfigurationSpec.java index 90b6dfc75c2..a55366f6443 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfigurationSpec.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfigurationSpec.java @@ -35,6 +35,7 @@ "apiVersion", "kind", "metadata", + "exempt", "limited", "type" }) @@ -60,6 +61,8 @@ public class PriorityLevelConfigurationSpec implements Editable , KubernetesResource { + @JsonProperty("exempt") + private ExemptPriorityLevelConfiguration exempt; @JsonProperty("limited") private LimitedPriorityLevelConfiguration limited; @JsonProperty("type") @@ -74,12 +77,23 @@ public class PriorityLevelConfigurationSpec implements Editable , KubernetesResource +{ + + @JsonProperty("lendablePercent") + private Integer lendablePercent; + @JsonProperty("nominalConcurrencyShares") + private Integer nominalConcurrencyShares; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ExemptPriorityLevelConfiguration() { + } + + public ExemptPriorityLevelConfiguration(Integer lendablePercent, Integer nominalConcurrencyShares) { + super(); + this.lendablePercent = lendablePercent; + this.nominalConcurrencyShares = nominalConcurrencyShares; + } + + @JsonProperty("lendablePercent") + public Integer getLendablePercent() { + return lendablePercent; + } + + @JsonProperty("lendablePercent") + public void setLendablePercent(Integer lendablePercent) { + this.lendablePercent = lendablePercent; + } + + @JsonProperty("nominalConcurrencyShares") + public Integer getNominalConcurrencyShares() { + return nominalConcurrencyShares; + } + + @JsonProperty("nominalConcurrencyShares") + public void setNominalConcurrencyShares(Integer nominalConcurrencyShares) { + this.nominalConcurrencyShares = nominalConcurrencyShares; + } + + @JsonIgnore + public ExemptPriorityLevelConfigurationBuilder edit() { + return new ExemptPriorityLevelConfigurationBuilder(this); + } + + @JsonIgnore + public ExemptPriorityLevelConfigurationBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationSpec.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationSpec.java index 0d4a04a3a09..7e4939cf6a3 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationSpec.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationSpec.java @@ -35,6 +35,7 @@ "apiVersion", "kind", "metadata", + "exempt", "limited", "type" }) @@ -60,6 +61,8 @@ public class PriorityLevelConfigurationSpec implements Editable , KubernetesResource { + @JsonProperty("exempt") + private ExemptPriorityLevelConfiguration exempt; @JsonProperty("limited") private LimitedPriorityLevelConfiguration limited; @JsonProperty("type") @@ -74,12 +77,23 @@ public class PriorityLevelConfigurationSpec implements Editable , KubernetesResource +{ + + @JsonProperty("lendablePercent") + private Integer lendablePercent; + @JsonProperty("nominalConcurrencyShares") + private Integer nominalConcurrencyShares; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ExemptPriorityLevelConfiguration() { + } + + public ExemptPriorityLevelConfiguration(Integer lendablePercent, Integer nominalConcurrencyShares) { + super(); + this.lendablePercent = lendablePercent; + this.nominalConcurrencyShares = nominalConcurrencyShares; + } + + @JsonProperty("lendablePercent") + public Integer getLendablePercent() { + return lendablePercent; + } + + @JsonProperty("lendablePercent") + public void setLendablePercent(Integer lendablePercent) { + this.lendablePercent = lendablePercent; + } + + @JsonProperty("nominalConcurrencyShares") + public Integer getNominalConcurrencyShares() { + return nominalConcurrencyShares; + } + + @JsonProperty("nominalConcurrencyShares") + public void setNominalConcurrencyShares(Integer nominalConcurrencyShares) { + this.nominalConcurrencyShares = nominalConcurrencyShares; + } + + @JsonIgnore + public ExemptPriorityLevelConfigurationBuilder edit() { + return new ExemptPriorityLevelConfigurationBuilder(this); + } + + @JsonIgnore + public ExemptPriorityLevelConfigurationBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/PriorityLevelConfigurationSpec.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/PriorityLevelConfigurationSpec.java index 2ed2a1117c2..c6719d572b9 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/PriorityLevelConfigurationSpec.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/PriorityLevelConfigurationSpec.java @@ -35,6 +35,7 @@ "apiVersion", "kind", "metadata", + "exempt", "limited", "type" }) @@ -60,6 +61,8 @@ public class PriorityLevelConfigurationSpec implements Editable , KubernetesResource { + @JsonProperty("exempt") + private ExemptPriorityLevelConfiguration exempt; @JsonProperty("limited") private LimitedPriorityLevelConfiguration limited; @JsonProperty("type") @@ -74,12 +77,23 @@ public class PriorityLevelConfigurationSpec implements Editable decodableVersions = new ArrayList(); @JsonProperty("encodingVersion") private String encodingVersion; + @JsonProperty("servedVersions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List servedVersions = new ArrayList(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -80,11 +84,12 @@ public class ServerStorageVersion implements Editable decodableVersions, String encodingVersion) { + public ServerStorageVersion(String apiServerID, List decodableVersions, String encodingVersion, List servedVersions) { super(); this.apiServerID = apiServerID; this.decodableVersions = decodableVersions; this.encodingVersion = encodingVersion; + this.servedVersions = servedVersions; } @JsonProperty("apiServerID") @@ -117,6 +122,16 @@ public void setEncodingVersion(String encodingVersion) { this.encodingVersion = encodingVersion; } + @JsonProperty("servedVersions") + public List getServedVersions() { + return servedVersions; + } + + @JsonProperty("servedVersions") + public void setServedVersions(List servedVersions) { + this.servedVersions = servedVersions; + } + @JsonIgnore public ServerStorageVersionBuilder edit() { return new ServerStorageVersionBuilder(this); diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json index 22c3dc9eaf2..a1ead9ef63b 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json @@ -207,6 +207,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_flowcontrol_v1alpha1_ExemptPriorityLevelConfiguration": { + "type": "object", + "properties": { + "lendablePercent": { + "type": "integer" + }, + "nominalConcurrencyShares": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.ExemptPriorityLevelConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_flowcontrol_v1alpha1_FlowDistinguisherMethod": { "type": "object", "properties": { @@ -573,6 +589,10 @@ "kubernetes_flowcontrol_v1alpha1_PriorityLevelConfigurationSpec": { "type": "object", "properties": { + "exempt": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.ExemptPriorityLevelConfiguration" + }, "limited": { "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_LimitedPriorityLevelConfiguration", "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.LimitedPriorityLevelConfiguration" @@ -715,6 +735,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_flowcontrol_v1beta1_ExemptPriorityLevelConfiguration": { + "type": "object", + "properties": { + "lendablePercent": { + "type": "integer" + }, + "nominalConcurrencyShares": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ExemptPriorityLevelConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_flowcontrol_v1beta1_FlowDistinguisherMethod": { "type": "object", "properties": { @@ -1079,6 +1115,10 @@ "kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationSpec": { "type": "object", "properties": { + "exempt": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ExemptPriorityLevelConfiguration" + }, "limited": { "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitedPriorityLevelConfiguration", "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitedPriorityLevelConfiguration" @@ -1221,6 +1261,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_flowcontrol_v1beta2_ExemptPriorityLevelConfiguration": { + "type": "object", + "properties": { + "lendablePercent": { + "type": "integer" + }, + "nominalConcurrencyShares": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ExemptPriorityLevelConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_flowcontrol_v1beta2_FlowDistinguisherMethod": { "type": "object", "properties": { @@ -1585,6 +1641,10 @@ "kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationSpec": { "type": "object", "properties": { + "exempt": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ExemptPriorityLevelConfiguration" + }, "limited": { "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration", "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration" @@ -1727,6 +1787,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_flowcontrol_v1beta3_ExemptPriorityLevelConfiguration": { + "type": "object", + "properties": { + "lendablePercent": { + "type": "integer" + }, + "nominalConcurrencyShares": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ExemptPriorityLevelConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_flowcontrol_v1beta3_FlowDistinguisherMethod": { "type": "object", "properties": { @@ -2091,6 +2167,10 @@ "kubernetes_flowcontrol_v1beta3_PriorityLevelConfigurationSpec": { "type": "object", "properties": { + "exempt": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ExemptPriorityLevelConfiguration" + }, "limited": { "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_LimitedPriorityLevelConfiguration", "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.LimitedPriorityLevelConfiguration" @@ -2248,6 +2328,13 @@ }, "encodingVersion": { "type": "string" + }, + "servedVersions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true, diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json index 1b8addfe3b7..477ef19465d 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json @@ -207,6 +207,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_flowcontrol_v1alpha1_ExemptPriorityLevelConfiguration": { + "type": "object", + "properties": { + "lendablePercent": { + "type": "integer" + }, + "nominalConcurrencyShares": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.ExemptPriorityLevelConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_flowcontrol_v1alpha1_FlowDistinguisherMethod": { "type": "object", "properties": { @@ -573,6 +589,10 @@ "kubernetes_flowcontrol_v1alpha1_PriorityLevelConfigurationSpec": { "type": "object", "properties": { + "exempt": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.ExemptPriorityLevelConfiguration" + }, "limited": { "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_LimitedPriorityLevelConfiguration", "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.LimitedPriorityLevelConfiguration" @@ -715,6 +735,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_flowcontrol_v1beta1_ExemptPriorityLevelConfiguration": { + "type": "object", + "properties": { + "lendablePercent": { + "type": "integer" + }, + "nominalConcurrencyShares": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ExemptPriorityLevelConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_flowcontrol_v1beta1_FlowDistinguisherMethod": { "type": "object", "properties": { @@ -1079,6 +1115,10 @@ "kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationSpec": { "type": "object", "properties": { + "exempt": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ExemptPriorityLevelConfiguration" + }, "limited": { "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitedPriorityLevelConfiguration", "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitedPriorityLevelConfiguration" @@ -1221,6 +1261,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_flowcontrol_v1beta2_ExemptPriorityLevelConfiguration": { + "type": "object", + "properties": { + "lendablePercent": { + "type": "integer" + }, + "nominalConcurrencyShares": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ExemptPriorityLevelConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_flowcontrol_v1beta2_FlowDistinguisherMethod": { "type": "object", "properties": { @@ -1585,6 +1641,10 @@ "kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationSpec": { "type": "object", "properties": { + "exempt": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ExemptPriorityLevelConfiguration" + }, "limited": { "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration", "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration" @@ -1727,6 +1787,22 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, + "kubernetes_flowcontrol_v1beta3_ExemptPriorityLevelConfiguration": { + "type": "object", + "properties": { + "lendablePercent": { + "type": "integer" + }, + "nominalConcurrencyShares": { + "type": "integer" + } + }, + "additionalProperties": true, + "javaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ExemptPriorityLevelConfiguration", + "javaInterfaces": [ + "io.fabric8.kubernetes.api.model.KubernetesResource" + ] + }, "kubernetes_flowcontrol_v1beta3_FlowDistinguisherMethod": { "type": "object", "properties": { @@ -2091,6 +2167,10 @@ "kubernetes_flowcontrol_v1beta3_PriorityLevelConfigurationSpec": { "type": "object", "properties": { + "exempt": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ExemptPriorityLevelConfiguration" + }, "limited": { "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_LimitedPriorityLevelConfiguration", "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.LimitedPriorityLevelConfiguration" @@ -2248,6 +2328,13 @@ }, "encodingVersion": { "type": "string" + }, + "servedVersions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true, @@ -2465,6 +2552,17 @@ }, "additionalProperties": true, "resources": { + "exemptprioritylevelconfiguration": { + "properties": { + "lendablePercent": { + "type": "integer" + }, + "nominalConcurrencyShares": { + "type": "integer" + } + }, + "additionalProperties": true + }, "fieldsv1": { "additionalProperties": true }, @@ -2480,7 +2578,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta1", + "default": "flowcontrol.apiserver.k8s.io/v1beta3", "required": true }, "kind": { @@ -2493,12 +2591,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchemaSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaSpec" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowSchemaSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaSpec" }, "status": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchemaStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaStatus" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowSchemaStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaStatus" } }, "additionalProperties": true @@ -2528,14 +2626,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta3", + "default": "flowcontrol.apiserver.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowSchema", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchema", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema" } }, "kind": { @@ -2553,22 +2651,22 @@ "flowschemaspec": { "properties": { "distinguisherMethod": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowDistinguisherMethod", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowDistinguisherMethod" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowDistinguisherMethod", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowDistinguisherMethod" }, "matchingPrecedence": { "type": "integer" }, "priorityLevelConfiguration": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_PriorityLevelConfigurationReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfigurationReference" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PriorityLevelConfigurationReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationReference" }, "rules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_PolicyRulesWithSubjects", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PolicyRulesWithSubjects" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PolicyRulesWithSubjects", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PolicyRulesWithSubjects" } } }, @@ -2580,8 +2678,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowSchemaCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchemaCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowSchemaCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaCondition" } } }, @@ -2607,8 +2705,8 @@ "type": "integer" }, "limitResponse": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitResponse" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitResponse" } }, "additionalProperties": true @@ -2616,8 +2714,8 @@ "limitresponse": { "properties": { "queuing": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_QueuingConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.QueuingConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_QueuingConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.QueuingConfiguration" }, "type": { "type": "string" @@ -2795,23 +2893,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_NonResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.NonResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_NonResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.NonResourcePolicyRule" } }, "resourceRules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_ResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.ResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_ResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ResourcePolicyRule" } }, "subjects": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_Subject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.Subject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_Subject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.Subject" } } }, @@ -2821,7 +2919,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta2", + "default": "flowcontrol.apiserver.k8s.io/v1beta1", "required": true }, "kind": { @@ -2834,12 +2932,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationSpec" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationSpec" }, "status": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationStatus" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationStatus" } }, "additionalProperties": true @@ -2869,14 +2967,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta1", + "default": "flowcontrol.apiserver.k8s.io/v1alpha1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_PriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfiguration" } }, "kind": { @@ -2901,9 +2999,13 @@ }, "prioritylevelconfigurationspec": { "properties": { + "exempt": { + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.ExemptPriorityLevelConfiguration" + }, "limited": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_LimitedPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.LimitedPriorityLevelConfiguration" }, "type": { "type": "string" @@ -2917,8 +3019,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationCondition" } } }, @@ -2984,6 +3086,13 @@ }, "encodingVersion": { "type": "string" + }, + "servedVersions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true @@ -3107,19 +3216,19 @@ "subject": { "properties": { "group": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_GroupSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.GroupSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_GroupSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.GroupSubject" }, "kind": { "type": "string" }, "serviceAccount": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ServiceAccountSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ServiceAccountSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_ServiceAccountSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ServiceAccountSubject" }, "user": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_UserSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.UserSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_UserSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.UserSubject" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json index 9e329489498..a01161de9a2 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json @@ -2560,7 +2560,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "kind": { @@ -2679,14 +2679,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": { @@ -3159,7 +3159,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -3642,7 +3642,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java index bb7c805b944..a686bffc5e8 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java @@ -39,8 +39,7 @@ "apiVersion", "kind", "metadata", - "spec", - "status" + "spec" }) @ToString @EqualsAndHashCode @@ -87,8 +86,6 @@ public class NetworkPolicy implements Editable , HasMetada private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private NetworkPolicySpec spec; - @JsonProperty("status") - private NetworkPolicyStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -99,13 +96,12 @@ public class NetworkPolicy implements Editable , HasMetada public NetworkPolicy() { } - public NetworkPolicy(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, NetworkPolicySpec spec, NetworkPolicyStatus status) { + public NetworkPolicy(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, NetworkPolicySpec spec) { super(); this.apiVersion = apiVersion; this.kind = kind; this.metadata = metadata; this.spec = spec; - this.status = status; } /** @@ -168,16 +164,6 @@ public void setSpec(NetworkPolicySpec spec) { this.spec = spec; } - @JsonProperty("status") - public NetworkPolicyStatus getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(NetworkPolicyStatus status) { - this.status = status; - } - @JsonIgnore public NetworkPolicyBuilder edit() { return new NetworkPolicyBuilder(this); diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/kube-schema.json index f1f8a3dd09a..5a773233ff2 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/kube-schema.json @@ -85,36 +85,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Condition": { - "type": "object", - "properties": { - "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" - }, - "message": { - "type": "string" - }, - "observedGeneration": { - "type": "integer", - "existingJavaType": "Long" - }, - "reason": { - "type": "string" - }, - "status": { - "type": "string" - }, - "type": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.Condition", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_CreateOptions": { "type": "object", "properties": { @@ -1400,10 +1370,6 @@ "spec": { "$ref": "#/definitions/kubernetes_networking_v1_NetworkPolicySpec", "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicySpec" - }, - "status": { - "$ref": "#/definitions/kubernetes_networking_v1_NetworkPolicyStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyStatus" } }, "additionalProperties": true, @@ -1576,24 +1542,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_networking_v1_NetworkPolicyStatus": { - "type": "object", - "properties": { - "conditions": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/kubernetes_apimachinery_Condition", - "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" - } - } - }, - "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyStatus", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_networking_v1_ServiceBackendPort": { "type": "object", "properties": { diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json index edb94cfc4c3..503e1df6fde 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json @@ -85,36 +85,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Condition": { - "type": "object", - "properties": { - "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" - }, - "message": { - "type": "string" - }, - "observedGeneration": { - "type": "integer", - "existingJavaType": "Long" - }, - "reason": { - "type": "string" - }, - "status": { - "type": "string" - }, - "type": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.Condition", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_CreateOptions": { "type": "object", "properties": { @@ -1400,10 +1370,6 @@ "spec": { "$ref": "#/definitions/kubernetes_networking_v1_NetworkPolicySpec", "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicySpec" - }, - "status": { - "$ref": "#/definitions/kubernetes_networking_v1_NetworkPolicyStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyStatus" } }, "additionalProperties": true, @@ -1576,24 +1542,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_networking_v1_NetworkPolicyStatus": { - "type": "object", - "properties": { - "conditions": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/kubernetes_apimachinery_Condition", - "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" - } - } - }, - "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyStatus", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_networking_v1_ServiceBackendPort": { "type": "object", "properties": { @@ -2436,31 +2384,6 @@ }, "additionalProperties": true }, - "condition": { - "properties": { - "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" - }, - "message": { - "type": "string" - }, - "observedGeneration": { - "type": "integer", - "existingJavaType": "Long" - }, - "reason": { - "type": "string" - }, - "status": { - "type": "string" - }, - "type": { - "type": "string" - } - }, - "additionalProperties": true - }, "createoptions": { "properties": { "apiVersion": { @@ -2560,8 +2483,8 @@ "httpingresspath": { "properties": { "backend": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressBackend", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressBackend" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressBackend", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBackend" }, "path": { "type": "string" @@ -2686,14 +2609,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1", + "default": "networking.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressClass" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass" } }, "kind": { @@ -2791,8 +2714,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressLoadBalancerIngress", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressLoadBalancerIngress" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressLoadBalancerIngress", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressLoadBalancerIngress" } } }, @@ -2847,9 +2770,9 @@ }, "ingressspec": { "properties": { - "backend": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressBackend", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBackend" + "defaultBackend": { + "$ref": "#/definitions/kubernetes_networking_v1_IngressBackend", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressBackend" }, "ingressClassName": { "type": "string" @@ -2858,16 +2781,16 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressRule" + "$ref": "#/definitions/kubernetes_networking_v1_IngressRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressRule" } }, "tls": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressTLS", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressTLS" + "$ref": "#/definitions/kubernetes_networking_v1_IngressTLS", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressTLS" } } }, @@ -3161,10 +3084,6 @@ "spec": { "$ref": "#/definitions/kubernetes_networking_v1_NetworkPolicySpec", "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicySpec" - }, - "status": { - "$ref": "#/definitions/kubernetes_networking_v1_NetworkPolicyStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyStatus" } }, "additionalProperties": true @@ -3301,19 +3220,6 @@ }, "additionalProperties": true }, - "networkpolicystatus": { - "properties": { - "conditions": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/kubernetes_apimachinery_Condition", - "existingJavaType": "io.fabric8.kubernetes.api.model.Condition" - } - } - }, - "additionalProperties": true - }, "nodeselector": { "properties": { "nodeSelectorTerms": { diff --git a/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json index 5522e041cad..e346b7da3ba 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json @@ -1110,12 +1110,9 @@ "properties": { "apiVersion": { "type": "string", - "default": "node.k8s.io/v1beta1", + "default": "node.k8s.io/v1alpha1", "required": true }, - "handler": { - "type": "string" - }, "kind": { "type": "string", "default": "RuntimeClass", @@ -1125,13 +1122,9 @@ "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, - "overhead": { - "$ref": "#/definitions/kubernetes_node_v1beta1_Overhead", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1beta1.Overhead" - }, - "scheduling": { - "$ref": "#/definitions/kubernetes_node_v1beta1_Scheduling", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1beta1.Scheduling" + "spec": { + "$ref": "#/definitions/kubernetes_node_v1alpha_RuntimeClassSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassSpec" } }, "additionalProperties": true @@ -1140,14 +1133,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "node.k8s.io/v1", + "default": "node.k8s.io/v1alpha1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_node_v1_RuntimeClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1.RuntimeClass" + "$ref": "#/definitions/kubernetes_node_v1alpha_RuntimeClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json index 2beb16cf40e..097818135b4 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json @@ -1906,7 +1906,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "policy/v1", + "default": "policy/v1beta1", "required": true }, "deleteOptions": { diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json index d4547304498..c7722ee5b0e 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json @@ -1491,7 +1491,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "scheduling.k8s.io/v1", + "default": "scheduling.k8s.io/v1beta1", "required": true }, "description": { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json index c645af978d8..6cb4761de21 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json @@ -2970,7 +2970,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1", + "default": "storage.k8s.io/v1beta1", "required": true }, "kind": { @@ -2983,8 +2983,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_storageclass_CSIDriverSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSIDriverSpec" + "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSIDriverSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverSpec" } }, "additionalProperties": true @@ -2993,14 +2993,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSIDriver", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver" + "$ref": "#/definitions/kubernetes_storageclass_CSIDriver", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSIDriver" } }, "kind": { @@ -3101,14 +3101,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSINode", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode" + "$ref": "#/definitions/kubernetes_storageclass_CSINode", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSINode" } }, "kind": { @@ -3128,8 +3128,8 @@ "drivers": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSINodeDriver", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeDriver" + "$ref": "#/definitions/kubernetes_storageclass_CSINodeDriver", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSINodeDriver" } } }, @@ -3183,7 +3183,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "capacity": { @@ -3217,14 +3217,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSIStorageCapacity", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity" + "$ref": "#/definitions/kubernetes_storageclass_CSIStorageCapacity", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity" } }, "kind": { diff --git a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json index eb1e46e14e3..125ee8431e9 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json @@ -921,6 +921,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1235,6 +1238,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1361,6 +1367,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" diff --git a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json index 4274e442b12..d6ca283ef26 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json @@ -921,6 +921,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1235,6 +1238,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1361,6 +1367,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -10392,6 +10401,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -10973,6 +10985,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -11094,6 +11109,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -12139,19 +12157,19 @@ }, "machinepool": { "properties": { - "coresPerSocket": { - "type": "integer" - }, - "cpus": { - "type": "integer" + "cpu": { + "$ref": "#/definitions/os_hive_ovirt_v1_CPU", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.CPU" }, "memoryMB": { - "type": "integer", - "existingJavaType": "Long" + "type": "integer" }, "osDisk": { - "$ref": "#/definitions/os_hive_vsphere_v1_OSDisk", - "existingJavaType": "io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk" + "$ref": "#/definitions/os_hive_ovirt_v1_Disk", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.Disk" + }, + "vmType": { + "type": "string" } }, "additionalProperties": true @@ -12766,7 +12784,15 @@ "osdisk": { "properties": { "diskSizeGB": { - "type": "integer" + "type": "integer", + "existingJavaType": "Long" + }, + "diskType": { + "type": "string" + }, + "encryptionKey": { + "$ref": "#/definitions/os_hive_gcp_v1_EncryptionKeyReference", + "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.EncryptionKeyReference" } }, "additionalProperties": true @@ -12891,18 +12917,15 @@ "$ref": "#/definitions/kubernetes_core_LocalObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" }, + "cloud": { + "type": "string" + }, "credentialsSecretRef": { "$ref": "#/definitions/kubernetes_core_LocalObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" }, - "ovirt_cluster_id": { - "type": "string" - }, - "ovirt_network_name": { - "type": "string" - }, - "storage_domain_id": { - "type": "string" + "trunkSupport": { + "type": "boolean" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json index 74aff292eda..3716920ce27 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json @@ -3401,24 +3401,22 @@ }, "machinepool": { "properties": { - "imageID": { + "architecture": { "type": "string" }, - "instanceType": { + "hyperthreading": { "type": "string" }, - "systemDiskCategory": { + "name": { "type": "string" }, - "systemDiskSize": { - "type": "integer" + "platform": { + "$ref": "#/definitions/os_installer_v1_MachinePoolPlatform", + "existingJavaType": "io.fabric8.openshift.api.model.installer.v1.MachinePoolPlatform" }, - "zones": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "replicas": { + "type": "integer", + "existingJavaType": "Long" } }, "additionalProperties": true @@ -3720,9 +3718,15 @@ }, "osdisk": { "properties": { - "diskSizeGiB": { - "type": "integer", - "existingJavaType": "Long" + "diskEncryptionSet": { + "$ref": "#/definitions/os_installer_azure_v1_DiskEncryptionSet", + "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.DiskEncryptionSet" + }, + "diskSizeGB": { + "type": "integer" + }, + "diskType": { + "type": "string" } }, "additionalProperties": true @@ -3779,6 +3783,85 @@ "additionalProperties": true }, "platform": { + "properties": { + "apiVIP": { + "type": "string" + }, + "apiVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "cluster": { + "type": "string" + }, + "clusterOSImage": { + "type": "string" + }, + "datacenter": { + "type": "string" + }, + "defaultDatastore": { + "type": "string" + }, + "defaultMachinePlatform": { + "$ref": "#/definitions/os_installer_vsphere_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool" + }, + "diskType": { + "type": "string" + }, + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_vsphere_v1_FailureDomain", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.FailureDomain" + } + }, + "folder": { + "type": "string" + }, + "ingressVIP": { + "type": "string" + }, + "ingressVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer" + }, + "network": { + "type": "string" + }, + "password": { + "type": "string" + }, + "resourcePool": { + "type": "string" + }, + "username": { + "type": "string" + }, + "vCenter": { + "type": "string" + }, + "vcenters": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_vsphere_v1_VCenter", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.VCenter" + } + } + }, "additionalProperties": true }, "porttarget": { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json index 196a7da25db..1d87faa906d 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json @@ -923,6 +923,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1737,6 +1740,13 @@ "type": "string" } }, + "allocatedResourceStatuses": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "allocatedResources": { "type": "object", "additionalProperties": { @@ -1763,9 +1773,6 @@ }, "phase": { "type": "string" - }, - "resizeStatus": { - "type": "string" } }, "additionalProperties": true, diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json index 5cd2bf43c9b..33f5589bbeb 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json @@ -923,6 +923,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1737,6 +1740,13 @@ "type": "string" } }, + "allocatedResourceStatuses": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "allocatedResources": { "type": "object", "additionalProperties": { @@ -1763,9 +1773,6 @@ }, "phase": { "type": "string" - }, - "resizeStatus": { - "type": "string" } }, "additionalProperties": true, @@ -8514,6 +8521,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -10018,6 +10028,13 @@ "type": "string" } }, + "allocatedResourceStatuses": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, "allocatedResources": { "type": "object", "additionalProperties": { @@ -10044,9 +10061,6 @@ }, "phase": { "type": "string" - }, - "resizeStatus": { - "type": "string" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/kube-schema.json index 231a7c9d1d8..6b7656f3393 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/kube-schema.json @@ -1244,6 +1244,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1558,6 +1561,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1684,6 +1690,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/validation-schema.json index cf00f2c1042..30d26cea730 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/validation-schema.json @@ -1244,6 +1244,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1558,6 +1561,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1684,6 +1690,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -7333,13 +7342,13 @@ "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" }, - "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" - }, "message": { "type": "string" }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, "reason": { "type": "string" }, @@ -7514,6 +7523,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -8132,6 +8144,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -8253,6 +8268,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" diff --git a/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json index d95b7d09e15..d0ba9e261eb 100644 --- a/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json @@ -1677,6 +1677,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1991,6 +1994,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -2117,6 +2123,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" diff --git a/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json index 8907d59f294..e2ec9077ac5 100644 --- a/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json @@ -1677,6 +1677,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -1991,6 +1994,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -2117,6 +2123,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -13280,6 +13289,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -14137,6 +14149,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" @@ -14258,6 +14273,9 @@ "$ref": "#/definitions/kubernetes_core_ResourceRequirements", "existingJavaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" }, + "restartPolicy": { + "type": "string" + }, "securityContext": { "$ref": "#/definitions/kubernetes_core_SecurityContext", "existingJavaType": "io.fabric8.kubernetes.api.model.SecurityContext" diff --git a/kubernetes-model-generator/pkg/schemagen/generate.go b/kubernetes-model-generator/pkg/schemagen/generate.go index f3acac0b66a..d75ea4ff7a0 100644 --- a/kubernetes-model-generator/pkg/schemagen/generate.go +++ b/kubernetes-model-generator/pkg/schemagen/generate.go @@ -178,7 +178,7 @@ func (g *schemaGenerator) javaType(t reflect.Type) string { case "Time": return "String" case "RawExtension": - return "io.fabric8.kubernetes.api.model.KubernetesResource" + return "io.fabric8.kubernetes.api.model.KubernetesResource" case "List": return pkgDesc.JavaPackage + ".KubernetesList" default: @@ -194,7 +194,7 @@ func (g *schemaGenerator) javaType(t reflect.Type) string { case reflect.Bool: return "bool" case reflect.Uint8: - return "Byte" + return "Byte" case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Uint, reflect.Uint16, reflect.Uint32: @@ -211,10 +211,10 @@ func (g *schemaGenerator) javaType(t reflect.Type) string { case reflect.Map: return "java.util.Map" default: - if t.Name() == "RawExtension" { - return "io.fabric8.kubernetes.api.model.KubernetesResource" - } - if t.Name() == "Time" { + if t.Name() == "RawExtension" { + return "io.fabric8.kubernetes.api.model.KubernetesResource" + } + if t.Name() == "Time" { return "String" } if len(t.Name()) == 0 && t.NumField() == 0 { @@ -301,7 +301,7 @@ func (g *schemaGenerator) generate(t reflect.Type, moduleName string) (*JSONSche ExistingJavaType: javaType, } } - + s.Definitions[name] = value s.Resources[resource] = v } @@ -557,14 +557,14 @@ func (g *schemaGenerator) isNamespaceScopedResource(t reflect.Type) bool { } func (g *schemaGenerator) isSubresourceContainingMetadata(t reflect.Type) bool { - subResourcesContainingMetadataList := []string{ - "JobTemplateSpec", - "PodTemplateSpec", - "PersistentVolumeClaimTemplate", - "MachineSpec", - "MachineTemplateSpec", - "ResourceClaimTemplateSpec", - } + subResourcesContainingMetadataList := []string{ + "JobTemplateSpec", + "PodTemplateSpec", + "PersistentVolumeClaimTemplate", + "MachineSpec", + "MachineTemplateSpec", + "ResourceClaimTemplateSpec", + } return Contains(subResourcesContainingMetadataList, t.Name()) } @@ -578,9 +578,12 @@ func (g *schemaGenerator) isClusterScopedResource(t reflect.Type) bool { "k8s.io/api/authentication/v1/TokenReview", "k8s.io/api/authentication/v1alpha1/SelfSubjectReview", "k8s.io/api/authentication/v1beta1/SelfSubjectReview", + "k8s.io/api/authentication/v1/SelfSubjectReview", "k8s.io/api/admissionregistration/v1beta1/MutatingWebhookConfiguration", "k8s.io/api/admissionregistration/v1alpha1/ValidatingAdmissionPolicy", + "k8s.io/api/admissionregistration/v1beta1/ValidatingAdmissionPolicy", "k8s.io/api/admissionregistration/v1alpha1/ValidatingAdmissionPolicyBinding", + "k8s.io/api/admissionregistration/v1beta1/ValidatingAdmissionPolicyBinding", "k8s.io/api/authorization/v1/SelfSubjectRulesReview", "k8s.io/api/authorization/v1beta1/SubjectAccessReview", "k8s.io/api/admissionregistration/v1beta1/ValidatingWebhookConfiguration", @@ -703,14 +706,14 @@ func (g *schemaGenerator) isClusterScopedResource(t reflect.Type) bool { "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1/MachineConfigPool", "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1/MachineConfig", "github.com/openshift/cluster-autoscaler-operator/pkg/apis/autoscaling/v1/ClusterAutoscaler", - "github.com/openshift/hive/apis/hive/v1/ClusterImageSet", - "github.com/openshift/hive/apis/hive/v1/SelectorSyncIdentityProvider", - "github.com/openshift/hive/apis/hive/v1/SelectorSyncSet", - "github.com/openshift/hive/apis/hive/v1/HiveConfig", + "github.com/openshift/hive/apis/hive/v1/ClusterImageSet", + "github.com/openshift/hive/apis/hive/v1/SelectorSyncIdentityProvider", + "github.com/openshift/hive/apis/hive/v1/SelectorSyncSet", + "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", + "sigs.k8s.io/gateway-api/apis/v1alpha2/GatewayClass", + "sigs.k8s.io/gateway-api/apis/v1beta1/GatewayClass", } return Contains(clusterScopedResourcesList, t.PkgPath()+"/"+t.Name())