Skip to content

Commit 1a8e81e

Browse files
committed
[DNM] Merge placement-operator into nova-operator
This is initial PR for getting feedback from reviewers. Closes: OSPRH-14957
1 parent 144e0f9 commit 1a8e81e

35 files changed

+2086
-13
lines changed

PROJECT

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Code generated by tool. DO NOT EDIT.
2+
# This file is used to track the info used to scaffold your project
3+
# and allow the plugins properly work.
4+
# More info: https://book.kubebuilder.io/reference/project-config.html
15
domain: openstack.org
26
layout:
37
- go.kubebuilder.io/v3
@@ -111,4 +115,17 @@ resources:
111115
defaulting: true
112116
validation: true
113117
webhookVersion: v1
118+
- api:
119+
crdVersion: v1
120+
namespaced: true
121+
controller: true
122+
domain: openstack.org
123+
group: nova
124+
kind: NovaPlacementAPI
125+
path: github.com/openstack-k8s-operators/nova-operator/api/v1beta1
126+
version: v1beta1
127+
webhooks:
128+
defaulting: true
129+
validation: true
130+
webhookVersion: v1
114131
version: "3"
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
apiVersion: apiextensions.k8s.io/v1
3+
kind: CustomResourceDefinition
4+
metadata:
5+
annotations:
6+
controller-gen.kubebuilder.io/version: v0.14.0
7+
name: novaplacementapis.nova.openstack.org
8+
spec:
9+
group: nova.openstack.org
10+
names:
11+
kind: NovaPlacementAPI
12+
listKind: NovaPlacementAPIList
13+
plural: novaplacementapis
14+
singular: novaplacementapi
15+
scope: Namespaced
16+
versions:
17+
- name: v1beta1
18+
schema:
19+
openAPIV3Schema:
20+
description: NovaPlacementAPI is the Schema for the novaplacementapis API
21+
properties:
22+
apiVersion:
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
28+
type: string
29+
kind:
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
36+
type: string
37+
metadata:
38+
type: object
39+
spec:
40+
description: NovaPlacementAPISpec defines the desired state of NovaPlacementAPI
41+
properties:
42+
foo:
43+
description: Foo is an example field of NovaPlacementAPI. Edit novaplacementapi_types.go
44+
to remove/update
45+
type: string
46+
type: object
47+
status:
48+
description: NovaPlacementAPIStatus defines the observed state of NovaPlacementAPI
49+
type: object
50+
type: object
51+
served: true
52+
storage: true
53+
subresources:
54+
status: {}

api/go.mod

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ go 1.21
44

55
require (
66
github.com/google/go-cmp v0.7.0
7+
github.com/onsi/ginkgo/v2 v2.20.1
8+
github.com/onsi/gomega v1.34.1
79
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250513115636-b549982a5d8f
810
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250508141203-be026d3164f7
911
github.com/robfig/cron/v3 v3.0.1
1012
k8s.io/api v0.29.15
1113
k8s.io/apimachinery v0.29.15
14+
k8s.io/client-go v0.29.15
1215
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
1316
sigs.k8s.io/controller-runtime v0.17.6
1417
)
@@ -21,14 +24,17 @@ require (
2124
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2225
github.com/fsnotify/fsnotify v1.7.0 // indirect
2326
github.com/go-logr/logr v1.4.2 // indirect
27+
github.com/go-logr/zapr v1.3.0 // indirect
2428
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2529
github.com/go-openapi/jsonreference v0.21.0 // indirect
2630
github.com/go-openapi/swag v0.23.0 // indirect
31+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
2732
github.com/gogo/protobuf v1.3.2 // indirect
2833
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2934
github.com/golang/protobuf v1.5.4 // indirect
3035
github.com/google/gnostic-models v0.6.8 // indirect
3136
github.com/google/gofuzz v1.2.0 // indirect
37+
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
3238
github.com/google/uuid v1.6.0 // indirect
3339
github.com/imdario/mergo v0.3.16 // indirect
3440
github.com/josharian/intern v1.0.0 // indirect
@@ -43,21 +49,23 @@ require (
4349
github.com/prometheus/common v0.51.1 // indirect
4450
github.com/prometheus/procfs v0.13.0 // indirect
4551
github.com/spf13/pflag v1.0.5 // indirect
52+
go.uber.org/multierr v1.11.0 // indirect
53+
go.uber.org/zap v1.27.0 // indirect
4654
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
4755
golang.org/x/net v0.28.0 // indirect
4856
golang.org/x/oauth2 v0.18.0 // indirect
4957
golang.org/x/sys v0.23.0 // indirect
5058
golang.org/x/term v0.23.0 // indirect
5159
golang.org/x/text v0.17.0 // indirect
5260
golang.org/x/time v0.5.0 // indirect
61+
golang.org/x/tools v0.24.0 // indirect
5362
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
5463
google.golang.org/appengine v1.6.8 // indirect
5564
google.golang.org/protobuf v1.34.1 // indirect
5665
gopkg.in/inf.v0 v0.9.1 // indirect
5766
gopkg.in/yaml.v2 v2.4.0 // indirect
5867
gopkg.in/yaml.v3 v3.0.1 // indirect
5968
k8s.io/apiextensions-apiserver v0.29.15 // indirect
60-
k8s.io/client-go v0.29.15 // indirect
6169
k8s.io/component-base v0.29.15 // indirect
6270
k8s.io/klog/v2 v2.120.1 // indirect
6371
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect

api/go.sum

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF
2424
github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
2525
github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
2626
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
27-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
2827
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
2928
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
3029
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=

api/v1beta1/common_types.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ import (
2525

2626
// Container image fall-back defaults
2727
const (
28-
NovaAPIContainerImage = "quay.io/podified-antelope-centos9/openstack-nova-api:current-podified"
29-
NovaConductorContainerImage = "quay.io/podified-antelope-centos9/openstack-nova-conductor:current-podified"
30-
NovaMetadataContainerImage = "quay.io/podified-antelope-centos9/openstack-nova-api:current-podified"
31-
NovaNoVNCContainerImage = "quay.io/podified-antelope-centos9/openstack-nova-novncproxy:current-podified"
32-
NovaSchedulerContainerImage = "quay.io/podified-antelope-centos9/openstack-nova-scheduler:current-podified"
33-
NovaComputeContainerImage = "quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"
28+
NovaAPIContainerImage = "quay.io/podified-antelope-centos9/openstack-nova-api:current-podified"
29+
NovaConductorContainerImage = "quay.io/podified-antelope-centos9/openstack-nova-conductor:current-podified"
30+
NovaMetadataContainerImage = "quay.io/podified-antelope-centos9/openstack-nova-api:current-podified"
31+
NovaNoVNCContainerImage = "quay.io/podified-antelope-centos9/openstack-nova-novncproxy:current-podified"
32+
NovaSchedulerContainerImage = "quay.io/podified-antelope-centos9/openstack-nova-scheduler:current-podified"
33+
NovaComputeContainerImage = "quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"
34+
NovaPlacementAPIContainerImage = "quay.io/podified-antelope-centos9/openstack-placement-api:current-podified"
3435
)
3536

3637
// Compute drivers names

0 commit comments

Comments
 (0)