Skip to content

Commit

Permalink
Rename to ironic-standalone-operator
Browse files Browse the repository at this point in the history
  • Loading branch information
dtantsur committed Feb 2, 2024
1 parent 7a905af commit c9b6022
Show file tree
Hide file tree
Showing 36 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion ARCHITECTURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ webhook will reject setting `distributed` to `true`).
The idea is to deploy ironic+httpd services in a daemon set on all control
plane nodes, while keeping dnsmasq (if enabled) on only one of them. There
are many unsolved issues with this setup - see
[ironic-operator#3](https://github.com/dtantsur/ironic-operator/issues/3).
[ironic-standalone-operator#3](https://github.com/dtantsur/ironic-standalone-operator/issues/3).
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
# This variable is used to construct full image tags for bundle and catalog images.
#
# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
# metal3.io/ironic-operator-bundle:$VERSION and metal3.io/ironic-operator-catalog:$VERSION.
IMAGE_TAG_BASE ?= metal3.io/ironic-operator
# metal3.io/ironic-standalone-operator-bundle:$VERSION and metal3.io/ironic-standalone-operator-catalog:$VERSION.
IMAGE_TAG_BASE ?= metal3.io/ironic-standalone-operator

# BUNDLE_IMG defines the image:tag used for the bundle.
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
Expand Down
8 changes: 4 additions & 4 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ layout:
plugins:
manifests.sdk.operatorframework.io/v2: {}
scorecard.sdk.operatorframework.io/v2: {}
projectName: ironic-operator
repo: github.com/metal3-io/ironic-operator
projectName: ironic-standalone-operator
repo: github.com/metal3-io/ironic-standalone-operator
resources:
- api:
crdVersion: v1
Expand All @@ -18,7 +18,7 @@ resources:
domain: metal3.io
group: metal3.io
kind: Ironic
path: github.com/metal3-io/ironic-operator/api/v1alpha1
path: github.com/metal3-io/ironic-standalone-operator/api/v1alpha1
version: v1alpha1
webhooks:
defaulting: true
Expand All @@ -31,7 +31,7 @@ resources:
domain: metal3.io
group: metal3.io
kind: IronicDatabase
path: github.com/metal3-io/ironic-operator/api/v1alpha1
path: github.com/metal3-io/ironic-standalone-operator/api/v1alpha1
version: v1alpha1
webhooks:
defaulting: true
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ By its nature, Ironic listens on a host network and thus is reachable on one of
the Kubernetes nodes, even from the outside (note the port):

```
$ kubectl get pod -n test -l metal3.io/ironic-operator=ironic-service -o wide
$ kubectl get pod -n test -l metal3.io/ironic-standalone-operator=ironic-service -o wide
NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES
ironic-service-698899755d-6xzxl 4/4 Running 0 152m 10.89.0.2 kind-control-plane <none> <none>
$ curl -k -u "$IRONIC_USER:$IRONIC_PASSWORD" https://10.89.0.2:6385/v1/drivers
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ const (
// Progressing indicates that Ironic deployment is in progress
IronicStatusProgressing IronicStatusConditionType = "Progressing"

IronicOperatorLabel = "metal3.io/ironic-operator"
IronicOperatorLabel = "metal3.io/ironic-standalone-operator"
)
8 changes: 4 additions & 4 deletions config/certmanager/certificate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ metadata:
app.kubernetes.io/name: issuer
app.kubernetes.io/instance: selfsigned-issuer
app.kubernetes.io/component: certificate
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: selfsigned-issuer
namespace: system
Expand All @@ -23,8 +23,8 @@ metadata:
app.kubernetes.io/name: certificate
app.kubernetes.io/instance: serving-cert
app.kubernetes.io/component: certificate
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: serving-cert # this name should match the one appeared in kustomizeconfig.yaml
namespace: system
Expand Down
4 changes: 2 additions & 2 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Adds namespace to all resources.
namespace: ironic-operator-system
namespace: ironic-standalone-operator-system

# Value of this field is prepended to the
# names of all resources, e.g. a deployment named
# "wordpress" becomes "alices-wordpress".
# Note that it should also match with the prefix (text before '-') of the namespace
# field above.
namePrefix: ironic-operator-
namePrefix: ironic-standalone-operator-

# Labels to add to all resources and selectors.
#commonLabels:
Expand Down
8 changes: 4 additions & 4 deletions config/default/webhookcainjection_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ metadata:
app.kubernetes.io/name: mutatingwebhookconfiguration
app.kubernetes.io/instance: mutating-webhook-configuration
app.kubernetes.io/component: webhook
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: mutating-webhook-configuration
annotations:
Expand All @@ -21,8 +21,8 @@ metadata:
app.kubernetes.io/name: validatingwebhookconfiguration
app.kubernetes.io/instance: validating-webhook-configuration
app.kubernetes.io/component: webhook
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: validating-webhook-configuration
annotations:
Expand Down
8 changes: 4 additions & 4 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
app.kubernetes.io/name: namespace
app.kubernetes.io/instance: system
app.kubernetes.io/component: manager
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: system
---
Expand All @@ -21,8 +21,8 @@ metadata:
app.kubernetes.io/name: deployment
app.kubernetes.io/instance: controller-manager
app.kubernetes.io/component: manager
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
spec:
selector:
Expand Down
2 changes: 1 addition & 1 deletion config/manifests/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# These resources constitute the fully configured set of manifests
# used to generate the 'manifests/' directory in a bundle.
resources:
- bases/ironic-operator.clusterserviceversion.yaml
- bases/ironic-standalone-operator.clusterserviceversion.yaml
- ../default
- ../samples
- ../scorecard
Expand Down
4 changes: 2 additions & 2 deletions config/prometheus/monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ metadata:
app.kubernetes.io/name: servicemonitor
app.kubernetes.io/instance: controller-manager-metrics-monitor
app.kubernetes.io/component: metrics
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: controller-manager-metrics-monitor
namespace: system
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/auth_proxy_client_clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
app.kubernetes.io/name: clusterrole
app.kubernetes.io/instance: metrics-reader
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: metrics-reader
rules:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/auth_proxy_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
app.kubernetes.io/name: clusterrole
app.kubernetes.io/instance: proxy-role
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: proxy-role
rules:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/auth_proxy_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
app.kubernetes.io/name: clusterrolebinding
app.kubernetes.io/instance: proxy-rolebinding
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: proxy-rolebinding
roleRef:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/auth_proxy_service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
app.kubernetes.io/name: service
app.kubernetes.io/instance: controller-manager-metrics-service
app.kubernetes.io/component: kube-rbac-proxy
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: controller-manager-metrics-service
namespace: system
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/ironic_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
app.kubernetes.io/name: clusterrole
app.kubernetes.io/instance: ironic-editor-role
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: ironic-editor-role
rules:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/ironic_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
app.kubernetes.io/name: clusterrole
app.kubernetes.io/instance: ironic-viewer-role
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: ironic-viewer-role
rules:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/ironicdatabase_editor_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
app.kubernetes.io/name: clusterrole
app.kubernetes.io/instance: ironicdatabase-editor-role
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: ironicdatabase-editor-role
rules:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/ironicdatabase_viewer_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
app.kubernetes.io/name: clusterrole
app.kubernetes.io/instance: ironicdatabase-viewer-role
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: ironicdatabase-viewer-role
rules:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/leader_election_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
app.kubernetes.io/name: role
app.kubernetes.io/instance: leader-election-role
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: leader-election-role
rules:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/leader_election_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
app.kubernetes.io/name: rolebinding
app.kubernetes.io/instance: leader-election-rolebinding
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: leader-election-rolebinding
roleRef:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
app.kubernetes.io/name: clusterrolebinding
app.kubernetes.io/instance: manager-rolebinding
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: manager-rolebinding
roleRef:
Expand Down
4 changes: 2 additions & 2 deletions config/rbac/service_account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
app.kubernetes.io/name: serviceaccount
app.kubernetes.io/instance: controller-manager
app.kubernetes.io/component: rbac
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: controller-manager
namespace: system
4 changes: 2 additions & 2 deletions config/samples/metal3.io_v1alpha1_ironic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
labels:
app.kubernetes.io/name: ironic
app.kubernetes.io/instance: ironic-sample
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
name: ironic-sample
spec:
# TODO(user): Add fields here
4 changes: 2 additions & 2 deletions config/samples/metal3.io_v1alpha1_ironicdatabase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
labels:
app.kubernetes.io/name: ironicdatabase
app.kubernetes.io/instance: ironicdatabase-sample
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
name: ironicdatabase-sample
spec:
# TODO(user): Add fields here
4 changes: 2 additions & 2 deletions config/webhook/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
app.kubernetes.io/name: service
app.kubernetes.io/instance: webhook-service
app.kubernetes.io/component: webhook
app.kubernetes.io/created-by: ironic-operator
app.kubernetes.io/part-of: ironic-operator
app.kubernetes.io/created-by: ironic-standalone-operator
app.kubernetes.io/part-of: ironic-standalone-operator
app.kubernetes.io/managed-by: kustomize
name: webhook-service
namespace: system
Expand Down
4 changes: 2 additions & 2 deletions controllers/ironic_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

"github.com/go-logr/logr"
metal3api "github.com/metal3-io/ironic-operator/api/v1alpha1"
"github.com/metal3-io/ironic-operator/pkg/ironic"
metal3api "github.com/metal3-io/ironic-standalone-operator/api/v1alpha1"
"github.com/metal3-io/ironic-standalone-operator/pkg/ironic"
)

// IronicReconciler reconciles a Ironic object
Expand Down
4 changes: 2 additions & 2 deletions controllers/ironicdatabase_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/go-logr/logr"
metal3api "github.com/metal3-io/ironic-operator/api/v1alpha1"
"github.com/metal3-io/ironic-operator/pkg/ironic"
metal3api "github.com/metal3-io/ironic-standalone-operator/api/v1alpha1"
"github.com/metal3-io/ironic-standalone-operator/pkg/ironic"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

metal3iov1alpha1 "github.com/metal3-io/ironic-operator/api/v1alpha1"
metal3iov1alpha1 "github.com/metal3-io/ironic-standalone-operator/api/v1alpha1"
//+kubebuilder:scaffold:imports
)

Expand Down
4 changes: 2 additions & 2 deletions controllers/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

metal3api "github.com/metal3-io/ironic-operator/api/v1alpha1"
"github.com/metal3-io/ironic-operator/pkg/ironic"
metal3api "github.com/metal3-io/ironic-standalone-operator/api/v1alpha1"
"github.com/metal3-io/ironic-standalone-operator/pkg/ironic"
)

func ensureFinalizer(cctx ironic.ControllerContext, obj client.Object) (bool, error) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/metal3-io/ironic-operator
module github.com/metal3-io/ironic-standalone-operator

go 1.19

Expand Down
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/webhook"

metal3iov1alpha1 "github.com/metal3-io/ironic-operator/api/v1alpha1"
"github.com/metal3-io/ironic-operator/controllers"
metal3iov1alpha1 "github.com/metal3-io/ironic-standalone-operator/api/v1alpha1"
"github.com/metal3-io/ironic-standalone-operator/controllers"
//+kubebuilder:scaffold:imports
)

Expand Down Expand Up @@ -115,7 +115,7 @@ func main() {
ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))

config := ctrl.GetConfigOrDie()
kubeClient := kubernetes.NewForConfigOrDie(rest.AddUserAgent(config, "ironic-operator"))
kubeClient := kubernetes.NewForConfigOrDie(rest.AddUserAgent(config, "ironic-standalone-operator"))

tlsOptionOverrides, err := GetTLSOptionOverrideFuncs(tlsOptions)
if err != nil {
Expand Down
Loading

0 comments on commit c9b6022

Please sign in to comment.