diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml deleted file mode 100644 index 1f147eddd109..000000000000 --- a/.github/workflows/go.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: hypershift - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - - build: - name: Build - runs-on: ubuntu-latest - steps: - - - name: Set up Go 1.x - uses: actions/setup-go@v2 - with: - go-version: ^1.15 - - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - name: Build - run: | - go build -o bin/hypershift-operator ./hypershift-operator - go build -o bin/control-plane-operator ./control-plane-operator - - - name: Test - run: go test -v ./... diff --git a/Dockerfile b/Dockerfile index 5080e4bf9aa5..9195882ea72e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ WORKDIR /hypershift COPY . . RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -o bin/hypershift-operator hypershift-operator/main.go -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -o bin/control-plane-operator control-plane-operator/main.go +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -o bin/hosted-cluster-config-operator hosted-cluster-config-operator/main.go FROM quay.io/openshift/origin-base:4.6 COPY --from=builder /hypershift/bin/hypershift-operator /usr/bin/hypershift-operator -COPY --from=builder /hypershift/bin/control-plane-operator /usr/bin/control-plane-operator +COPY --from=builder /hypershift/bin/hosted-cluster-config-operator /usr/bin/hosted-cluster-config-operator diff --git a/HACKING.md b/HACKING.md index 0023e5cc94d9..91d906d32863 100644 --- a/HACKING.md +++ b/HACKING.md @@ -1,39 +1,52 @@ # Hacking -### Development workflow +## Development How-to Guides -Often it's easiest to develop the operator locally connected to a remote -cluster. -In this case, you might want to install with the development Kustomize -profile which uses 0 replicas for the operator deployment by default. This -makes it easy to iterate on the non-deployment manifests in conjunction -with the operator binary itself. +### Run the operator in a local process -Starting from clean management cluster, run the following to get started: +1. Ensure KUBECONFIG points to a management cluster with no HyperShift installed yet. -```bash -$ make build +2. Build HyperShift. -$ make install PROFILE=development + make build -$ make run-local -``` +3. Install HyperShift with the operator deployment scaled to zero so that it + doesn't conflict with your local operator process. -Or you might want to run your own image in the cluster to do integration -testing, in which case you may want to use the default (production) profile -and use `kubectl set image` (for example) to update the deployment. + make install PROFILE=development -### Testing +4. Run the HyperShift operator locally. -To run the e2e tests, install HyperShift (using whatever profile you want) and -then run: + make run-local -```bash -$ make test-e2e -``` +### Run custom operator images + +1. Build and push a custom image build to your own repository. + + make IMG=quay.io/my/hypershift:latest docker-build docker-push + +2. Deploy the latest production version. + + make install PROFILE=production + +3. Reconfigure the HyperShift operator deployment to use your custom image. + This will also cause the image you specify to be used for the hosted cluster + config operator as well. + + oc --namespace hypershift set image deployment/operator operator=quay.io/my/hypershift:latest + +### Run the e2e tests + +1. Install HyperShift. + + make install PROFILE=production + +2. Run the tests. + + make test-e2e -### Visualizing dependencies +### Visualize the Go dependency tree MacOS ``` diff --git a/Makefile b/Makefile index bd5891da53df..9b97da656434 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ endif all: build manifests -build: hypershift-operator control-plane-operator +build: hypershift-operator hosted-cluster-config-operator verify: build fmt vet @@ -46,9 +46,9 @@ generate: hypershift-operator: generate $(GO_BUILD_RECIPE) -o bin/hypershift-operator ./hypershift-operator -# Build control-plane-operator binary -control-plane-operator: generate - $(GO_BUILD_RECIPE) -o bin/control-plane-operator ./control-plane-operator +# Build hosted-cluster-config-operator binary +hosted-cluster-config-operator: generate + $(GO_BUILD_RECIPE) -o bin/hosted-cluster-config-operator ./hosted-cluster-config-operator # Run tests test: build diff --git a/control-plane-operator/controllers/autoapprover/reconciler.go b/hosted-cluster-config-operator/controllers/autoapprover/reconciler.go similarity index 100% rename from control-plane-operator/controllers/autoapprover/reconciler.go rename to hosted-cluster-config-operator/controllers/autoapprover/reconciler.go diff --git a/control-plane-operator/controllers/autoapprover/setup.go b/hosted-cluster-config-operator/controllers/autoapprover/setup.go similarity index 83% rename from control-plane-operator/controllers/autoapprover/setup.go rename to hosted-cluster-config-operator/controllers/autoapprover/setup.go index 5af6edbc0418..66490d35809d 100644 --- a/control-plane-operator/controllers/autoapprover/setup.go +++ b/hosted-cluster-config-operator/controllers/autoapprover/setup.go @@ -9,11 +9,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/source" - "openshift.io/hypershift/control-plane-operator/controllers" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) -func Setup(cfg *operator.ControlPlaneOperatorConfig) error { +func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error { informerFactory := informers.NewSharedInformerFactory(cfg.TargetKubeClient(), controllers.DefaultResync) cfg.Manager().Add(manager.RunnableFunc(func(ctx context.Context) error { informerFactory.Start(ctx.Done()) diff --git a/control-plane-operator/controllers/clusteroperator/reconcile.go b/hosted-cluster-config-operator/controllers/clusteroperator/reconcile.go similarity index 100% rename from control-plane-operator/controllers/clusteroperator/reconcile.go rename to hosted-cluster-config-operator/controllers/clusteroperator/reconcile.go diff --git a/control-plane-operator/controllers/clusteroperator/setup.go b/hosted-cluster-config-operator/controllers/clusteroperator/setup.go similarity index 65% rename from control-plane-operator/controllers/clusteroperator/setup.go rename to hosted-cluster-config-operator/controllers/clusteroperator/setup.go index aa0592476b4d..6e706d802c69 100644 --- a/control-plane-operator/controllers/clusteroperator/setup.go +++ b/hosted-cluster-config-operator/controllers/clusteroperator/setup.go @@ -5,18 +5,18 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/source" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) -func Setup(cfg *operator.ControlPlaneOperatorConfig) error { +func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error { clusterOperators := cfg.TargetConfigInformers().Config().V1().ClusterOperators() reconciler := &ControlPlaneClusterOperatorSyncer{ Versions: cfg.Versions(), Client: cfg.TargetConfigClient(), Lister: clusterOperators.Lister(), - Log: cfg.Logger().WithName("ControlPlaneClusterOperatorSyncer"), + Log: cfg.Logger().WithName("HostedClusterConfigOperatorSyncer"), } - c, err := controller.New("control-plane-operator-syncer", cfg.Manager(), controller.Options{Reconciler: reconciler}) + c, err := controller.New("hosted-cluster-config-operator-syncer", cfg.Manager(), controller.Options{Reconciler: reconciler}) if err != nil { return err } diff --git a/control-plane-operator/controllers/clusterversion/reconcile.go b/hosted-cluster-config-operator/controllers/clusterversion/reconcile.go similarity index 100% rename from control-plane-operator/controllers/clusterversion/reconcile.go rename to hosted-cluster-config-operator/controllers/clusterversion/reconcile.go diff --git a/control-plane-operator/controllers/clusterversion/setup.go b/hosted-cluster-config-operator/controllers/clusterversion/setup.go similarity index 85% rename from control-plane-operator/controllers/clusterversion/setup.go rename to hosted-cluster-config-operator/controllers/clusterversion/setup.go index 2366ddbf5ce5..2f79885617e5 100644 --- a/control-plane-operator/controllers/clusterversion/setup.go +++ b/hosted-cluster-config-operator/controllers/clusterversion/setup.go @@ -11,11 +11,11 @@ import ( configclient "github.com/openshift/client-go/config/clientset/versioned" configinformers "github.com/openshift/client-go/config/informers/externalversions" - "openshift.io/hypershift/control-plane-operator/controllers" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) -func Setup(cfg *operator.ControlPlaneOperatorConfig) error { +func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error { openshiftClient, err := configclient.NewForConfig(cfg.TargetConfig()) if err != nil { return err diff --git a/control-plane-operator/controllers/cmca/configmap_observer.go b/hosted-cluster-config-operator/controllers/cmca/configmap_observer.go similarity index 100% rename from control-plane-operator/controllers/cmca/configmap_observer.go rename to hosted-cluster-config-operator/controllers/cmca/configmap_observer.go diff --git a/control-plane-operator/controllers/cmca/setup.go b/hosted-cluster-config-operator/controllers/cmca/setup.go similarity index 79% rename from control-plane-operator/controllers/cmca/setup.go rename to hosted-cluster-config-operator/controllers/cmca/setup.go index b296c6d099be..d63575dd0ab2 100644 --- a/control-plane-operator/controllers/cmca/setup.go +++ b/hosted-cluster-config-operator/controllers/cmca/setup.go @@ -6,8 +6,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/source" - "openshift.io/hypershift/control-plane-operator/controllers" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) const ( @@ -16,14 +16,14 @@ const ( syncInterval = 10 * time.Minute ) -func Setup(cfg *operator.ControlPlaneOperatorConfig) error { +func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error { if err := setupConfigMapObserver(cfg); err != nil { return err } return nil } -func setupConfigMapObserver(cfg *operator.ControlPlaneOperatorConfig) error { +func setupConfigMapObserver(cfg *operator.HostedClusterConfigOperatorConfig) error { informerFactory := cfg.TargetKubeInformersForNamespace(ManagedConfigNamespace) configMaps := informerFactory.Core().V1().ConfigMaps() reconciler := &ManagedCAObserver{ diff --git a/control-plane-operator/controllers/common.go b/hosted-cluster-config-operator/controllers/common.go similarity index 100% rename from control-plane-operator/controllers/common.go rename to hosted-cluster-config-operator/controllers/common.go diff --git a/control-plane-operator/controllers/infrastatus/reconcile.go b/hosted-cluster-config-operator/controllers/infrastatus/reconcile.go similarity index 100% rename from control-plane-operator/controllers/infrastatus/reconcile.go rename to hosted-cluster-config-operator/controllers/infrastatus/reconcile.go diff --git a/control-plane-operator/controllers/infrastatus/setup.go b/hosted-cluster-config-operator/controllers/infrastatus/setup.go similarity index 93% rename from control-plane-operator/controllers/infrastatus/setup.go rename to hosted-cluster-config-operator/controllers/infrastatus/setup.go index 97f7765e28f8..dbdff76bd0e3 100644 --- a/control-plane-operator/controllers/infrastatus/setup.go +++ b/hosted-cluster-config-operator/controllers/infrastatus/setup.go @@ -13,7 +13,7 @@ import ( configv1 "github.com/openshift/api/config/v1" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) const ( @@ -31,7 +31,7 @@ func init() { } } -func Setup(cfg *operator.ControlPlaneOperatorConfig) error { +func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error { infrastructures := cfg.TargetConfigInformers().Config().V1().Infrastructures() sourceInfraConfigMap, err := cfg.KubeClient().CoreV1().ConfigMaps(cfg.Namespace()).Get(context.TODO(), infrastructureConfigMap, metav1.GetOptions{}) if err != nil { diff --git a/control-plane-operator/controllers/kubeadminpwd/oauthrestarter.go b/hosted-cluster-config-operator/controllers/kubeadminpwd/oauthrestarter.go similarity index 100% rename from control-plane-operator/controllers/kubeadminpwd/oauthrestarter.go rename to hosted-cluster-config-operator/controllers/kubeadminpwd/oauthrestarter.go diff --git a/control-plane-operator/controllers/kubeadminpwd/oauthrestarter_test.go b/hosted-cluster-config-operator/controllers/kubeadminpwd/oauthrestarter_test.go similarity index 100% rename from control-plane-operator/controllers/kubeadminpwd/oauthrestarter_test.go rename to hosted-cluster-config-operator/controllers/kubeadminpwd/oauthrestarter_test.go diff --git a/control-plane-operator/controllers/kubeadminpwd/setup.go b/hosted-cluster-config-operator/controllers/kubeadminpwd/setup.go similarity index 85% rename from control-plane-operator/controllers/kubeadminpwd/setup.go rename to hosted-cluster-config-operator/controllers/kubeadminpwd/setup.go index 97644f7f0662..7de1ef7666a2 100644 --- a/control-plane-operator/controllers/kubeadminpwd/setup.go +++ b/hosted-cluster-config-operator/controllers/kubeadminpwd/setup.go @@ -10,15 +10,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/source" - "openshift.io/hypershift/control-plane-operator/controllers" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) const ( KubeAdminSecret = "kubeadmin" ) -func Setup(cfg *operator.ControlPlaneOperatorConfig) error { +func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error { informerFactory := informers.NewSharedInformerFactoryWithOptions(cfg.TargetKubeClient(), controllers.DefaultResync, informers.WithNamespace(metav1.NamespaceSystem)) cfg.Manager().Add(manager.RunnableFunc(func(ctx context.Context) error { informerFactory.Start(ctx.Done()) diff --git a/control-plane-operator/controllers/kubeletservingca/setup.go b/hosted-cluster-config-operator/controllers/kubeletservingca/setup.go similarity index 86% rename from control-plane-operator/controllers/kubeletservingca/setup.go rename to hosted-cluster-config-operator/controllers/kubeletservingca/setup.go index 4e25fc2fa64f..b0714d0a2e20 100644 --- a/control-plane-operator/controllers/kubeletservingca/setup.go +++ b/hosted-cluster-config-operator/controllers/kubeletservingca/setup.go @@ -5,14 +5,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/source" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) const ( ManagedConfigNamespace = "openshift-config-managed" ) -func Setup(cfg *operator.ControlPlaneOperatorConfig) error { +func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error { informerFactory := cfg.TargetKubeInformersForNamespace(ManagedConfigNamespace) configMaps := informerFactory.Core().V1().ConfigMaps() diff --git a/control-plane-operator/controllers/kubeletservingca/syncer.go b/hosted-cluster-config-operator/controllers/kubeletservingca/syncer.go similarity index 91% rename from control-plane-operator/controllers/kubeletservingca/syncer.go rename to hosted-cluster-config-operator/controllers/kubeletservingca/syncer.go index 1816d63e00d7..e67eb584cb30 100644 --- a/control-plane-operator/controllers/kubeletservingca/syncer.go +++ b/hosted-cluster-config-operator/controllers/kubeletservingca/syncer.go @@ -16,8 +16,8 @@ import ( // syncInterval is the amount of time to use between checks var syncInterval = 20 * time.Minute -// controlPlaneOperatorConfig is the name of the source configmap on the management cluster -const controlPlaneOperatorConfig = "control-plane-operator" +// hostedClusterConfigOperatorConfig is the name of the source configmap on the management cluster +const hostedClusterConfigOperatorConfig = "hosted-cluster-config-operator" type KubeletServingCASyncer struct { TargetClient kubeclient.Interface diff --git a/control-plane-operator/controllers/node/reconciler.go b/hosted-cluster-config-operator/controllers/node/reconciler.go similarity index 100% rename from control-plane-operator/controllers/node/reconciler.go rename to hosted-cluster-config-operator/controllers/node/reconciler.go diff --git a/control-plane-operator/controllers/node/setup.go b/hosted-cluster-config-operator/controllers/node/setup.go similarity index 82% rename from control-plane-operator/controllers/node/setup.go rename to hosted-cluster-config-operator/controllers/node/setup.go index 42e0ed80449d..36c029b3d57b 100644 --- a/control-plane-operator/controllers/node/setup.go +++ b/hosted-cluster-config-operator/controllers/node/setup.go @@ -9,11 +9,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/source" - "openshift.io/hypershift/control-plane-operator/controllers" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) -func Setup(cfg *operator.ControlPlaneOperatorConfig) error { +func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error { informerFactory := informers.NewSharedInformerFactory(cfg.TargetKubeClient(), controllers.DefaultResync) cfg.Manager().Add(manager.RunnableFunc(func(ctx context.Context) error { informerFactory.Start(ctx.Done()) diff --git a/control-plane-operator/controllers/openshiftapiserver/controller.go b/hosted-cluster-config-operator/controllers/openshiftapiserver/controller.go similarity index 97% rename from control-plane-operator/controllers/openshiftapiserver/controller.go rename to hosted-cluster-config-operator/controllers/openshiftapiserver/controller.go index 612270b00a9c..5d571e890d73 100644 --- a/control-plane-operator/controllers/openshiftapiserver/controller.go +++ b/hosted-cluster-config-operator/controllers/openshiftapiserver/controller.go @@ -30,11 +30,11 @@ import ( "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/resourcesynccontroller" - "openshift.io/hypershift/control-plane-operator/controllers" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) -func Setup(cfg *operator.ControlPlaneOperatorConfig) error { +func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error { targetCfg := cfg.TargetConfig() kubeInformers := kubeinformers.NewSharedInformerFactoryWithOptions(cfg.TargetKubeClient(), controllers.DefaultResync, kubeinformers.WithNamespace("openshift-apiserver")) configClient, err := configclient.NewForConfig(targetCfg) diff --git a/control-plane-operator/controllers/openshiftapiservermonitor/controller.go b/hosted-cluster-config-operator/controllers/openshiftapiservermonitor/controller.go similarity index 100% rename from control-plane-operator/controllers/openshiftapiservermonitor/controller.go rename to hosted-cluster-config-operator/controllers/openshiftapiservermonitor/controller.go diff --git a/control-plane-operator/controllers/openshiftapiservermonitor/setup.go b/hosted-cluster-config-operator/controllers/openshiftapiservermonitor/setup.go similarity index 89% rename from control-plane-operator/controllers/openshiftapiservermonitor/setup.go rename to hosted-cluster-config-operator/controllers/openshiftapiservermonitor/setup.go index f79194e4b343..f4482c524cfe 100644 --- a/control-plane-operator/controllers/openshiftapiservermonitor/setup.go +++ b/hosted-cluster-config-operator/controllers/openshiftapiservermonitor/setup.go @@ -15,11 +15,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/source" - "openshift.io/hypershift/control-plane-operator/controllers" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) -func Setup(cfg *operator.ControlPlaneOperatorConfig) error { +func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error { apiextClient, err := apiextensionsclient.NewForConfig(cfg.TargetConfig()) if err != nil { return err diff --git a/control-plane-operator/controllers/openshiftcontrollermanager/controller.go b/hosted-cluster-config-operator/controllers/openshiftcontrollermanager/controller.go similarity index 93% rename from control-plane-operator/controllers/openshiftcontrollermanager/controller.go rename to hosted-cluster-config-operator/controllers/openshiftcontrollermanager/controller.go index 0277508f599b..5db05d2d70f8 100644 --- a/control-plane-operator/controllers/openshiftcontrollermanager/controller.go +++ b/hosted-cluster-config-operator/controllers/openshiftcontrollermanager/controller.go @@ -18,11 +18,11 @@ import ( "github.com/openshift/library-go/pkg/operator/configobserver" "github.com/openshift/library-go/pkg/operator/events" - "openshift.io/hypershift/control-plane-operator/controllers" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) -func Setup(cfg *operator.ControlPlaneOperatorConfig) error { +func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error { targetCfg := cfg.TargetConfig() kubeInformers := kubeinformers.NewSharedInformerFactoryWithOptions(cfg.TargetKubeClient(), controllers.DefaultResync, kubeinformers.WithNamespace("openshift-controller-manager-operator")) configClient, err := configclient.NewForConfig(targetCfg) diff --git a/control-plane-operator/controllers/openshiftcontrollermanager/operator_client.go b/hosted-cluster-config-operator/controllers/openshiftcontrollermanager/operator_client.go similarity index 100% rename from control-plane-operator/controllers/openshiftcontrollermanager/operator_client.go rename to hosted-cluster-config-operator/controllers/openshiftcontrollermanager/operator_client.go diff --git a/control-plane-operator/controllers/routesync/namegeneration.go b/hosted-cluster-config-operator/controllers/routesync/namegeneration.go similarity index 100% rename from control-plane-operator/controllers/routesync/namegeneration.go rename to hosted-cluster-config-operator/controllers/routesync/namegeneration.go diff --git a/control-plane-operator/controllers/routesync/reconcile.go b/hosted-cluster-config-operator/controllers/routesync/reconcile.go similarity index 100% rename from control-plane-operator/controllers/routesync/reconcile.go rename to hosted-cluster-config-operator/controllers/routesync/reconcile.go diff --git a/control-plane-operator/controllers/routesync/reconcile_test.go b/hosted-cluster-config-operator/controllers/routesync/reconcile_test.go similarity index 100% rename from control-plane-operator/controllers/routesync/reconcile_test.go rename to hosted-cluster-config-operator/controllers/routesync/reconcile_test.go diff --git a/control-plane-operator/controllers/routesync/setup.go b/hosted-cluster-config-operator/controllers/routesync/setup.go similarity index 89% rename from control-plane-operator/controllers/routesync/setup.go rename to hosted-cluster-config-operator/controllers/routesync/setup.go index 7961935d041f..0e122f46ef59 100644 --- a/control-plane-operator/controllers/routesync/setup.go +++ b/hosted-cluster-config-operator/controllers/routesync/setup.go @@ -11,11 +11,11 @@ import ( routeclient "github.com/openshift/client-go/route/clientset/versioned" routeinformers "github.com/openshift/client-go/route/informers/externalversions" - "openshift.io/hypershift/control-plane-operator/controllers" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) -func Setup(cfg *operator.ControlPlaneOperatorConfig) error { +func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error { targetClient, err := routeclient.NewForConfig(cfg.TargetConfig()) if err != nil { return err diff --git a/control-plane-operator/main.go b/hosted-cluster-config-operator/main.go similarity index 69% rename from control-plane-operator/main.go rename to hosted-cluster-config-operator/main.go index 5c99ed8aa681..2c1a4f86c1f4 100644 --- a/control-plane-operator/main.go +++ b/hosted-cluster-config-operator/main.go @@ -13,17 +13,17 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "openshift.io/hypershift/control-plane-operator/controllers/autoapprover" - "openshift.io/hypershift/control-plane-operator/controllers/clusteroperator" - "openshift.io/hypershift/control-plane-operator/controllers/clusterversion" - "openshift.io/hypershift/control-plane-operator/controllers/cmca" - "openshift.io/hypershift/control-plane-operator/controllers/infrastatus" - "openshift.io/hypershift/control-plane-operator/controllers/kubeadminpwd" - "openshift.io/hypershift/control-plane-operator/controllers/kubeletservingca" - "openshift.io/hypershift/control-plane-operator/controllers/node" - "openshift.io/hypershift/control-plane-operator/controllers/openshiftapiservermonitor" - "openshift.io/hypershift/control-plane-operator/controllers/routesync" - "openshift.io/hypershift/control-plane-operator/operator" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers/autoapprover" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers/clusteroperator" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers/clusterversion" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers/cmca" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers/infrastatus" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers/kubeadminpwd" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers/kubeletservingca" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers/node" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers/openshiftapiservermonitor" + "openshift.io/hypershift/hosted-cluster-config-operator/controllers/routesync" + "openshift.io/hypershift/hosted-cluster-config-operator/operator" ) const ( @@ -34,7 +34,7 @@ const ( func main() { log.SetLogger(zap.New(zap.UseDevMode(true))) setupLog := ctrl.Log.WithName("setup") - if err := newControlPlaneOperatorCommand().Execute(); err != nil { + if err := newHostedClusterConfigOperatorCommand().Execute(); err != nil { setupLog.Error(err, "Operator failed") } } @@ -56,7 +56,7 @@ var controllerFuncs = map[string]operator.ControllerSetupFunc{ "node": node.Setup, } -type ControlPlaneOperator struct { +type HostedClusterConfigOperator struct { // Namespace is the namespace on the management cluster where the control plane components run. Namespace string @@ -78,11 +78,11 @@ type ControlPlaneOperator struct { initialCA []byte } -func newControlPlaneOperatorCommand() *cobra.Command { - cpo := newControlPlaneOperator() +func newHostedClusterConfigOperatorCommand() *cobra.Command { + cpo := newHostedClusterConfigOperator() cmd := &cobra.Command{ - Use: "control-plane-operator", - Short: "The Hypershift Control Plane Operator contains a set of controllers that manage an OpenShift hosted control plane.", + Use: "hosted-cluster-config-operator", + Short: "The Hosted Control Plane Config Operator contains a set of controllers that manage an OpenShift hosted control plane.", RunE: func(cmd *cobra.Command, args []string) error { if err := cpo.Validate(); err != nil { return err @@ -102,8 +102,8 @@ func newControlPlaneOperatorCommand() *cobra.Command { return cmd } -func newControlPlaneOperator() *ControlPlaneOperator { - return &ControlPlaneOperator{ +func newHostedClusterConfigOperator() *HostedClusterConfigOperator { + return &HostedClusterConfigOperator{ Controllers: allControllers(), } } @@ -116,7 +116,7 @@ func allControllers() []string { return controllers } -func (o *ControlPlaneOperator) Validate() error { +func (o *HostedClusterConfigOperator) Validate() error { if len(o.Controllers) == 0 { return fmt.Errorf("at least one controller is required") } @@ -126,7 +126,7 @@ func (o *ControlPlaneOperator) Validate() error { return nil } -func (o *ControlPlaneOperator) Complete() error { +func (o *HostedClusterConfigOperator) Complete() error { var err error if len(o.InitialCAFile) > 0 { o.initialCA, err = ioutil.ReadFile(o.InitialCAFile) @@ -145,12 +145,12 @@ func (o *ControlPlaneOperator) Complete() error { return nil } -func (o *ControlPlaneOperator) Run(ctx context.Context) error { +func (o *HostedClusterConfigOperator) Run(ctx context.Context) error { versions := map[string]string{ "release": o.ReleaseVersion, "kubernetes": o.KubernetesVersion, } - cfg := operator.NewControlPlaneOperatorConfig( + cfg := operator.NewHostedClusterConfigOperatorConfig( o.TargetKubeconfig, o.Namespace, o.initialCA, diff --git a/control-plane-operator/operator/config.go b/hosted-cluster-config-operator/operator/config.go similarity index 70% rename from control-plane-operator/operator/config.go rename to hosted-cluster-config-operator/operator/config.go index bddc0706a94a..37c415607117 100644 --- a/control-plane-operator/operator/config.go +++ b/hosted-cluster-config-operator/operator/config.go @@ -19,13 +19,13 @@ import ( configclient "github.com/openshift/client-go/config/clientset/versioned" configinformers "github.com/openshift/client-go/config/informers/externalversions" - common "openshift.io/hypershift/control-plane-operator/controllers" + common "openshift.io/hypershift/hosted-cluster-config-operator/controllers" ) -type ControllerSetupFunc func(*ControlPlaneOperatorConfig) error +type ControllerSetupFunc func(*HostedClusterConfigOperatorConfig) error -func NewControlPlaneOperatorConfig(targetKubeconfig, namespace string, initialCA []byte, versions map[string]string, controllers []string, controllerFuncs map[string]ControllerSetupFunc) *ControlPlaneOperatorConfig { - return &ControlPlaneOperatorConfig{ +func NewHostedClusterConfigOperatorConfig(targetKubeconfig, namespace string, initialCA []byte, versions map[string]string, controllers []string, controllerFuncs map[string]ControllerSetupFunc) *HostedClusterConfigOperatorConfig { + return &HostedClusterConfigOperatorConfig{ targetKubeconfig: targetKubeconfig, namespace: namespace, initialCA: initialCA, @@ -35,7 +35,7 @@ func NewControlPlaneOperatorConfig(targetKubeconfig, namespace string, initialCA } } -type ControlPlaneOperatorConfig struct { +type HostedClusterConfigOperatorConfig struct { manager ctrl.Manager config *rest.Config targetConfig *rest.Config @@ -53,7 +53,7 @@ type ControlPlaneOperatorConfig struct { namespacedInformers map[string]informers.SharedInformerFactory } -func (c *ControlPlaneOperatorConfig) Scheme() *runtime.Scheme { +func (c *HostedClusterConfigOperatorConfig) Scheme() *runtime.Scheme { if c.scheme == nil { c.scheme = runtime.NewScheme() kubescheme.AddToScheme(c.scheme) @@ -61,7 +61,7 @@ func (c *ControlPlaneOperatorConfig) Scheme() *runtime.Scheme { return c.scheme } -func (c *ControlPlaneOperatorConfig) Manager() ctrl.Manager { +func (c *HostedClusterConfigOperatorConfig) Manager() ctrl.Manager { if c.manager == nil { var err error c.manager, err = ctrl.NewManager(c.TargetConfig(), ctrl.Options{ @@ -78,29 +78,29 @@ func (c *ControlPlaneOperatorConfig) Manager() ctrl.Manager { return c.manager } -func (c *ControlPlaneOperatorConfig) Namespace() string { +func (c *HostedClusterConfigOperatorConfig) Namespace() string { return c.namespace } -func (c *ControlPlaneOperatorConfig) TargetNamespace() string { +func (c *HostedClusterConfigOperatorConfig) TargetNamespace() string { return "openshift-config-managed" } -func (c *ControlPlaneOperatorConfig) Config() *rest.Config { +func (c *HostedClusterConfigOperatorConfig) Config() *rest.Config { if c.config == nil { c.config = ctrl.GetConfigOrDie() } return c.config } -func (c *ControlPlaneOperatorConfig) Logger() logr.Logger { +func (c *HostedClusterConfigOperatorConfig) Logger() logr.Logger { if c.logger == nil { c.logger = ctrl.Log.WithName("hypershift-operator") } return c.logger } -func (c *ControlPlaneOperatorConfig) TargetConfig() *rest.Config { +func (c *HostedClusterConfigOperatorConfig) TargetConfig() *rest.Config { if c.targetConfig == nil { var err error c.targetConfig, err = clientcmd.NewNonInteractiveDeferredLoadingClientConfig( @@ -113,7 +113,7 @@ func (c *ControlPlaneOperatorConfig) TargetConfig() *rest.Config { return c.targetConfig } -func (c *ControlPlaneOperatorConfig) TargetKubeClient() kubeclient.Interface { +func (c *HostedClusterConfigOperatorConfig) TargetKubeClient() kubeclient.Interface { if c.targetKubeClient == nil { var err error c.targetKubeClient, err = kubeclient.NewForConfig(c.TargetConfig()) @@ -124,7 +124,7 @@ func (c *ControlPlaneOperatorConfig) TargetKubeClient() kubeclient.Interface { return c.targetKubeClient } -func (c *ControlPlaneOperatorConfig) TargetConfigClient() configclient.Interface { +func (c *HostedClusterConfigOperatorConfig) TargetConfigClient() configclient.Interface { client, err := configclient.NewForConfig(c.TargetConfig()) if err != nil { c.Fatal(err, "cannot get target config client") @@ -132,7 +132,7 @@ func (c *ControlPlaneOperatorConfig) TargetConfigClient() configclient.Interface return client } -func (c *ControlPlaneOperatorConfig) TargetConfigInformers() configinformers.SharedInformerFactory { +func (c *HostedClusterConfigOperatorConfig) TargetConfigInformers() configinformers.SharedInformerFactory { informerFactory := configinformers.NewSharedInformerFactory(c.TargetConfigClient(), common.DefaultResync) c.Manager().Add(manager.RunnableFunc(func(ctx context.Context) error { informerFactory.Start(ctx.Done()) @@ -141,7 +141,7 @@ func (c *ControlPlaneOperatorConfig) TargetConfigInformers() configinformers.Sha return informerFactory } -func (c *ControlPlaneOperatorConfig) TargetKubeInformersForNamespace(namespace string) informers.SharedInformerFactory { +func (c *HostedClusterConfigOperatorConfig) TargetKubeInformersForNamespace(namespace string) informers.SharedInformerFactory { informer, exists := c.namespacedInformers[namespace] if !exists { informer = informers.NewSharedInformerFactoryWithOptions(c.TargetKubeClient(), common.DefaultResync, informers.WithNamespace(namespace)) @@ -157,7 +157,7 @@ func (c *ControlPlaneOperatorConfig) TargetKubeInformersForNamespace(namespace s return informer } -func (c *ControlPlaneOperatorConfig) KubeClient() kubeclient.Interface { +func (c *HostedClusterConfigOperatorConfig) KubeClient() kubeclient.Interface { if c.kubeClient == nil { var err error c.kubeClient, err = kubeclient.NewForConfig(c.Config()) @@ -168,20 +168,20 @@ func (c *ControlPlaneOperatorConfig) KubeClient() kubeclient.Interface { return c.kubeClient } -func (c *ControlPlaneOperatorConfig) Versions() map[string]string { +func (c *HostedClusterConfigOperatorConfig) Versions() map[string]string { return c.versions } -func (c *ControlPlaneOperatorConfig) InitialCA() string { +func (c *HostedClusterConfigOperatorConfig) InitialCA() string { return string(c.initialCA) } -func (c *ControlPlaneOperatorConfig) Fatal(err error, msg string) { +func (c *HostedClusterConfigOperatorConfig) Fatal(err error, msg string) { c.Logger().Error(err, msg) os.Exit(1) } -func (c *ControlPlaneOperatorConfig) Start(ctx context.Context) error { +func (c *HostedClusterConfigOperatorConfig) Start(ctx context.Context) error { for _, controllerName := range c.controllers { setupFunc, ok := c.controllerFuncs[controllerName] if !ok { diff --git a/hypershift-operator/assets/controlplane/hypershift/bindata.go b/hypershift-operator/assets/controlplane/hypershift/bindata.go index 3875b5cadeb8..2a045d58f6b4 100644 --- a/hypershift-operator/assets/controlplane/hypershift/bindata.go +++ b/hypershift-operator/assets/controlplane/hypershift/bindata.go @@ -28,11 +28,6 @@ // hypershift-operator/assets/controlplane/hypershift/cluster-bootstrap/node-bootstrapper-clusterrolebinding.yaml (347B) // hypershift-operator/assets/controlplane/hypershift/cluster-version-operator/cluster-version-operator-deployment.yaml (2.31kB) // hypershift-operator/assets/controlplane/hypershift/common/service-network-admin-kubeconfig-secret.yaml (137B) -// hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-configmap.yaml (137B) -// hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-deployment.yaml (2.779kB) -// hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-role.yaml (509B) -// hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-rolebinding.yaml (255B) -// hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-serviceaccount.yaml (115B) // hypershift-operator/assets/controlplane/hypershift/etcd/etcd-cluster-crd.yaml (444B) // hypershift-operator/assets/controlplane/hypershift/etcd/etcd-cluster.yaml (265B) // hypershift-operator/assets/controlplane/hypershift/etcd/etcd-operator-cluster-role-binding.yaml (272B) @@ -40,6 +35,11 @@ // hypershift-operator/assets/controlplane/hypershift/etcd/etcd-operator-serviceaccount.yaml (68B) // hypershift-operator/assets/controlplane/hypershift/etcd/etcd-operator.yaml (643B) // hypershift-operator/assets/controlplane/hypershift/etcd/etcd-secret-template.yaml (220B) +// hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-configmap.yaml (145B) +// hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-deployment.yaml (2.877kB) +// hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-role.yaml (517B) +// hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-rolebinding.yaml (279B) +// hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-serviceaccount.yaml (123B) // hypershift-operator/assets/controlplane/hypershift/hypershift-operator/hypershift-operator-configmap.yaml (134B) // hypershift-operator/assets/controlplane/hypershift/ignition-configs/20-apiserver-haproxy.yaml (1.335kB) // hypershift-operator/assets/controlplane/hypershift/ignition-configs/99-worker-ssh.yaml (321B) @@ -783,243 +783,243 @@ func commonServiceNetworkAdminKubeconfigSecretYaml() (*asset, error) { return a, nil } -var _controlPlaneOperatorCpOperatorConfigmapYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x34\xca\xa1\xce\x02\x31\x0c\x07\x70\xdf\xa7\xf8\xe7\xfc\xbe\xe4\x4b\x50\xb3\x68\x2c\x96\x94\xad\x90\xe6\xb6\x76\x19\x05\x73\xdc\xbb\x63\xc0\xff\x78\xe8\x59\xe6\x43\xdd\x32\x5e\xff\xb4\xaa\xd5\x8c\xa3\xdb\x4d\xef\x27\x1e\xd4\x25\xb8\x72\x70\x26\xc0\xb8\x4b\x46\x71\x8b\xe9\x2d\x8d\xc6\x26\xc9\x87\x4c\x0e\x9f\xf4\x43\x6a\x1a\xca\x2d\x15\xfe\x2b\x33\x32\xde\xb4\x6d\x50\x2b\xed\x59\xe5\x32\x56\xc5\x52\xbc\x5f\xd5\xa4\x7e\xc9\x02\x1c\xb0\xef\xf4\x09\x00\x00\xff\xff\x72\xad\x7e\xc6\x89\x00\x00\x00") +var _etcdEtcdClusterCrdYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x90\xb1\x6e\xf3\x30\x0c\x84\x77\x3d\x05\x5f\x20\xfa\x91\x7f\x2a\xb4\xa6\x9d\x5a\x64\xe8\xd0\x9d\x91\x59\x97\x88\x2d\x0a\x24\x15\xb4\x6f\x5f\xd8\x72\x61\xa4\xe8\x48\x1e\xef\xf4\xe9\xb0\xf2\x1b\xa9\xb1\x94\x04\x58\x99\x3e\x9d\xca\x32\x59\xbc\x3e\x58\x64\xf9\x77\x3b\x5e\xc8\xf1\x18\xae\x5c\x86\x04\xa7\x66\x2e\xf3\x2b\x99\x34\xcd\xf4\x48\xef\x5c\xd8\x59\x4a\x98\xc9\x71\x40\xc7\x14\x00\x0a\xce\x94\x80\x3c\x0f\x79\x6a\xe6\xa4\x16\x97\x21\x2e\xfa\x05\x8d\x62\x16\x25\xb1\x98\x65\x0e\x56\x29\x2f\x9e\x2c\xe5\xb6\x71\x04\x00\x00\x73\x45\xa7\xf1\x2b\xc1\x59\x0a\x05\x80\x51\xa5\xd5\x9e\xfa\x67\x50\x7f\xd6\xba\xbb\xc3\x3e\x79\x1e\x4e\x9d\x60\xdd\x4e\x6c\xfe\xfc\x5b\x79\x61\xf3\x55\xad\x53\x53\x9c\xee\xb9\x3b\xca\x87\xa8\x9f\xf7\xf0\xc3\x7a\xd2\x25\x2e\x63\x9b\x50\xef\x5c\x01\xc0\xb2\x54\x4a\xb0\x9a\x2a\x66\x5a\xae\x7f\xbe\x07\xbd\xd1\xff\xfb\x6a\xcd\x3d\x6c\xb5\xed\x2a\x80\x91\xde\x68\x48\xe0\xda\x68\x6b\x45\x14\x47\xda\x36\xdf\x01\x00\x00\xff\xff\x99\xa0\xbc\xf0\xbc\x01\x00\x00") -func controlPlaneOperatorCpOperatorConfigmapYamlBytes() ([]byte, error) { +func etcdEtcdClusterCrdYamlBytes() ([]byte, error) { return bindataRead( - _controlPlaneOperatorCpOperatorConfigmapYaml, - "control-plane-operator/cp-operator-configmap.yaml", + _etcdEtcdClusterCrdYaml, + "etcd/etcd-cluster-crd.yaml", ) } -func controlPlaneOperatorCpOperatorConfigmapYaml() (*asset, error) { - bytes, err := controlPlaneOperatorCpOperatorConfigmapYamlBytes() +func etcdEtcdClusterCrdYaml() (*asset, error) { + bytes, err := etcdEtcdClusterCrdYamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "control-plane-operator/cp-operator-configmap.yaml", size: 137, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xcd, 0x19, 0x62, 0xb0, 0xae, 0x52, 0xc0, 0xf3, 0xd4, 0x65, 0xe5, 0xde, 0xad, 0x16, 0x7c, 0xa7, 0x78, 0x49, 0x89, 0x97, 0x6d, 0xa4, 0x37, 0xe7, 0xd3, 0xa3, 0x92, 0xc, 0x4b, 0xd3, 0x7, 0xcb}} + info := bindataFileInfo{name: "etcd/etcd-cluster-crd.yaml", size: 444, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x45, 0x93, 0x34, 0xc, 0x9, 0xb9, 0xc7, 0x3, 0x46, 0x2c, 0x53, 0x30, 0x38, 0x86, 0xce, 0x84, 0x56, 0x5b, 0xa2, 0xf8, 0xfb, 0x25, 0xec, 0xb0, 0x19, 0x8, 0x76, 0x5d, 0x11, 0x39, 0x8b, 0x17}} return a, nil } -var _controlPlaneOperatorCpOperatorDeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x56\x4d\x6f\xe3\x36\x10\xbd\xfb\x57\x0c\x84\x3d\xb4\x07\xc5\x9b\xab\x80\x1c\x5c\x5b\x8b\x1a\x9b\x38\x86\x9d\xec\xa5\x28\x02\x86\x1a\xd9\x44\x28\x92\x4b\x52\x4e\x5c\xc1\xff\xbd\xa0\x3e\x2c\x52\x96\x37\xbd\x55\x27\xeb\xcd\xcc\x9b\x37\x9c\xe1\xc8\x44\xb1\x1f\xa8\x0d\x93\x22\x01\xa2\x94\x99\x1e\x6e\x27\x6f\x4c\x64\x09\x2c\x50\x71\x79\x2c\x50\xd8\x49\x81\x96\x64\xc4\x92\x64\x02\x20\x48\x81\x09\x50\x29\xac\x96\x3c\x56\x9c\x08\x8c\xa5\x42\x4d\xac\xd4\x13\xa3\x90\x3a\x27\x8d\x8a\x33\x4a\x4c\x02\xb7\x13\x00\x83\x1c\xa9\x95\xda\x59\x00\x0a\x62\xe9\xfe\x9e\xbc\x22\x37\x0d\x00\x2e\xf1\x55\x4a\x00\x8b\x85\xe2\xc4\x62\x1b\xee\x69\x71\x0f\x0f\x98\x3e\xe3\x6a\x1e\xca\x4b\x63\x51\x2f\x17\x09\x44\x55\x05\x37\xf3\xee\x1d\x4e\xa7\x68\x52\x55\xc0\x72\xb8\xd9\xa0\xb1\x44\xdb\x05\xb1\x08\xa7\x53\xa7\x54\x08\x69\x89\x65\x52\x78\x29\xa5\x42\x61\xf6\x2c\xb7\x37\x4c\x4e\x75\x13\x86\xd9\xcc\xb6\xec\x21\x51\xcd\x8f\x22\xeb\x38\xbb\x23\xab\xd9\xf3\x9c\x09\x66\x8f\x3d\xb5\x92\xd9\xec\x02\x04\x50\x1a\x73\xd4\x1a\xb3\x45\xa9\x99\xd8\x6d\xe9\x1e\xb3\x92\x33\xb1\x5b\xee\x84\x3c\xc3\xe9\x07\xd2\xd2\x69\xf5\x43\x01\x62\x78\x47\xb6\xdb\xdb\x04\x6e\xbf\x7e\x0d\x2c\x41\xbe\x27\xd4\x45\x32\x30\xb7\xc7\xbd\x0d\x1a\x1a\x3e\x75\x7b\xd3\x0f\xa5\xd1\x98\xf0\x98\x42\x0d\x6f\x78\x4c\xfa\x46\x8c\x3a\xd5\x27\x5b\x77\x2e\x81\xa5\xb8\xe2\x72\x20\xbc\x44\x93\xc0\x5f\x97\x9d\xfc\xfb\x22\xc4\x4a\x25\xb9\xdc\x1d\xbf\xbb\xe4\xd1\x5b\xf9\x8a\x5a\xa0\x45\xe3\x1a\xb7\x97\xc6\xba\xe1\x8e\x26\x9d\x2f\x77\xc9\xc3\x1a\x5a\xdd\x51\x51\x72\xcb\x62\xf2\x4f\xfc\x2e\xf5\x1b\xea\x68\x32\xa6\x39\x4a\x7f\x96\x84\xfb\xb6\x5a\x6c\x02\x91\xd5\x25\xfa\x38\xe6\x39\x52\x9b\xc0\x4a\xb6\xad\xc4\x6e\x0a\x1f\x88\xab\x67\xad\x99\xd4\xcc\x1e\xe7\x9c\x18\xd3\x4f\xa3\xf2\xe1\x55\x7d\x31\xdd\x21\x5c\x89\x09\xe7\x0e\xea\x4b\x42\x98\x40\x7d\xae\x2f\x06\x56\x90\x5d\xcb\x32\x6f\xee\xd0\xda\x5d\xa1\xc7\xb6\xa6\xa5\x33\xf7\x0c\x9f\x6c\x83\xb6\x84\x31\xa2\x2d\xd2\xd2\x89\xf3\xb9\x4c\x8b\x39\x7f\xfc\xb0\xfe\xe0\xe8\x52\xcc\xcc\xb3\x41\x7d\x5d\x9a\xcf\x38\xac\x14\x00\xc5\xc1\x6f\x62\x23\x7b\xfd\xb8\x78\x59\xcd\x1e\xd2\xed\x7a\x36\x4f\x87\x5d\xfa\xa6\xe5\x60\xfc\x73\x86\x3c\xdb\x60\x3e\x9c\xe8\x1a\x5f\x13\xbb\x4f\xce\xcb\xe9\xc6\x25\x30\x8a\x50\xbc\x48\xfa\xb8\x4e\x57\xdb\x3f\x97\xdf\x9e\x5e\x36\xe9\x7d\x3a\xdb\xa6\x2f\x3f\xd2\xcd\x76\xf9\xb8\xba\x1c\x93\xaa\x82\x43\xb3\x9b\x21\xd2\xc8\x91\x18\x8c\xfc\xa2\x3a\xca\xef\xcf\x7f\xa4\x9b\x55\xfa\x94\x6e\xff\x1b\x57\x3f\xf7\x01\x1d\x95\x45\x41\x44\xe6\x9f\x53\x34\x2d\x8d\x9e\xbe\x32\x31\x1d\x6f\x71\xe4\xfb\xc6\xb1\xdb\x1b\x8c\xf0\x98\x92\x38\x67\x1c\xef\xa6\x68\xe9\xb4\xcf\xe6\x48\x72\xb6\x9b\xf6\x6e\x37\x54\xdb\x01\x87\x25\x7a\x87\x36\x76\x51\x8d\xfb\x05\x4b\x6f\xf2\x7e\x0e\x58\xce\xe7\x1f\xe0\x5f\x7e\x0b\x5a\xfe\x7b\x54\x55\x9a\x88\x1d\xc2\x97\xb6\x3c\x8e\x1a\x92\xbb\xf1\x01\x9b\x9f\x5d\x4c\xd8\x84\x28\x8e\xfb\x70\x73\x57\x55\x1e\xdb\xe9\x14\x55\x15\x8a\xac\x19\xca\x6b\xb7\x61\x83\x46\x96\x9a\x62\x40\xac\x3b\x30\xa9\x2a\x68\x64\x7e\x1a\xdc\x7b\x76\xe8\x06\x7f\x96\x68\xac\x4f\xec\xa8\x6b\xd0\xd4\x63\x51\x8b\x5a\x3f\x87\x1e\x00\x54\x95\xed\x65\xab\x6d\xe7\x2b\xd5\xed\x25\x2c\xa4\x3e\x0e\x83\x8a\x1a\x6d\xb7\x50\xe7\xe1\x87\x9e\x7f\x0c\x64\xde\xb3\x82\x0d\x44\x72\x07\xfd\x9f\x12\xdb\x15\x72\xb9\x4c\x0e\x92\x97\x05\x3e\xc8\x52\xd8\xe0\xd3\x50\x38\xa4\x59\x04\xd7\x67\xd6\x13\xd3\xdc\xde\x11\xd3\x2f\xa9\xae\xd0\x04\x70\xfb\x27\x64\x2d\x39\xa3\xc7\x04\x66\xfc\x9d\x1c\x4d\x6b\x33\xa8\x0f\x8c\xe2\x8c\x52\x97\x63\xf5\xab\x05\xee\x97\xeb\x7d\x24\xae\xea\x36\x48\x35\x06\x8b\xbb\x41\x9a\x24\x6d\xe2\x58\xa0\x75\x5f\xcd\x98\x64\x05\x13\xf1\x05\x4d\x3c\x56\x10\xb4\xaf\x0f\x44\x25\x63\xa5\x8f\xa9\xff\x37\x00\x00\xff\xff\x5d\x43\xd6\x6b\xdb\x0a\x00\x00") +var _etcdEtcdClusterYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\xcd\x3f\x4f\x03\x31\x0c\x05\xf0\x3d\x9f\xc2\xea\xde\xa0\x6b\xb7\x5b\x11\x1b\x5b\x11\xbb\xcf\x79\x43\xc4\xe5\x8f\x6c\x73\x03\x9f\x1e\x85\xa8\x08\xba\xd9\x4f\x3f\x3f\x73\xcf\xef\x50\xcb\xad\xae\x04\x97\x14\x13\x3b\x6f\x6c\x88\xd2\x14\xcd\xa2\xb4\xf2\x74\x2c\x1b\x9c\x2f\xe1\x23\xd7\xb4\xd2\x8b\x4b\x7a\xde\x3f\xcd\xa1\xa1\xc0\x79\x5c\xac\x81\xa8\x72\xc1\x2c\x09\xd6\x21\x23\xb2\xfc\x85\x95\x96\x40\x74\xdc\x9f\x9c\xae\xf1\x12\x97\xeb\x29\x10\xbd\xbd\xde\x06\x22\x32\x67\xcf\x32\x67\xa2\x82\xb2\x41\xef\x1b\x51\x07\xf4\x06\x51\xf8\x6c\x3f\x8f\xe0\xec\xbb\xfd\x0a\x83\x1e\x0f\x66\x46\x7f\x54\xeb\x50\xf6\xf6\x5f\xc9\x9e\x51\xfd\x47\x7d\x07\x00\x00\xff\xff\xd6\x50\xc7\x57\x09\x01\x00\x00") -func controlPlaneOperatorCpOperatorDeploymentYamlBytes() ([]byte, error) { +func etcdEtcdClusterYamlBytes() ([]byte, error) { return bindataRead( - _controlPlaneOperatorCpOperatorDeploymentYaml, - "control-plane-operator/cp-operator-deployment.yaml", + _etcdEtcdClusterYaml, + "etcd/etcd-cluster.yaml", ) } -func controlPlaneOperatorCpOperatorDeploymentYaml() (*asset, error) { - bytes, err := controlPlaneOperatorCpOperatorDeploymentYamlBytes() +func etcdEtcdClusterYaml() (*asset, error) { + bytes, err := etcdEtcdClusterYamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "control-plane-operator/cp-operator-deployment.yaml", size: 2779, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x91, 0xc, 0xba, 0x6b, 0x7, 0xad, 0x41, 0xf3, 0xcd, 0xd8, 0x3a, 0xa7, 0xec, 0xc5, 0x6b, 0x53, 0x47, 0xe0, 0x2f, 0x17, 0x7d, 0x87, 0xb1, 0xfe, 0x9b, 0xec, 0x1a, 0x5b, 0x44, 0xbb, 0xcf, 0xef}} + info := bindataFileInfo{name: "etcd/etcd-cluster.yaml", size: 265, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x12, 0xba, 0x60, 0x3a, 0x37, 0x96, 0x38, 0x15, 0xbd, 0x24, 0xf8, 0x69, 0xef, 0xfc, 0x88, 0x4c, 0xcd, 0x43, 0xd7, 0xe6, 0xfe, 0x16, 0xd8, 0xe9, 0xaa, 0x8, 0x45, 0x73, 0x26, 0x6b, 0x15, 0x30}} return a, nil } -var _controlPlaneOperatorCpOperatorRoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x90\xbf\x6e\xf3\x30\x0c\xc4\x77\x3d\x85\xa0\xf9\xb3\x83\x6f\x2b\xfc\x02\xdd\x3b\x74\x29\x3a\x30\x12\x13\x0b\x91\x45\x82\xa4\xd2\x3f\x4f\x5f\x58\x4e\x81\xa0\x29\x8a\x76\x3b\x51\x77\xfa\x9d\x08\x9c\x1f\x51\x34\x53\x9d\xbc\xec\x21\x8e\xd0\x6c\x26\xc9\xef\x60\x99\xea\x78\xba\xd3\x31\xd3\xee\xfc\xdf\x9d\x72\x4d\x93\x7f\xa0\x82\x6e\x41\x83\x04\x06\x93\xf3\xbe\xc2\x82\x93\x8f\x54\x4d\xa8\x0c\x5c\xa0\xe2\x40\x8c\x02\x46\xe2\xa4\x15\xd4\xc9\x0d\x1e\x38\xdf\x0b\x35\xd6\x35\x32\xf8\x10\x9c\xf7\x82\x4a\x4d\x22\x5e\x66\x91\xea\x21\x1f\x17\x60\xed\x47\xa6\xb4\x8a\x33\xca\xfe\x62\x38\xa2\x6d\x37\x60\x71\xee\xaa\x71\x02\xc3\x2d\x2d\xf8\x29\x4b\xd6\xcd\xf8\xd2\x8d\xd7\x70\xff\x14\xf0\xd5\xb0\xae\xdf\xd5\xf0\xcf\x07\x60\xd6\xf0\x7c\x5b\x26\x21\x17\x7a\x5b\xb0\xda\x5f\x4a\xfc\x40\xee\x63\xa1\x66\x38\x12\x63\xd5\x39\x1f\x6c\xcc\x74\x4b\xee\x1e\xbd\x92\xbb\xd8\xd4\x68\x19\x66\xea\x8f\x7f\xd3\xe5\x0b\xf6\x37\x3b\x4a\x58\xd0\xd0\x7d\x04\x00\x00\xff\xff\xab\x53\x7e\x43\xfd\x01\x00\x00") +var _etcdEtcdOperatorClusterRoleBindingYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x7c\x8d\xb1\x6e\xc3\x30\x0c\x44\x77\x7d\x05\x7f\xc0\x2a\xba\x15\xda\xda\x0e\xdd\x3a\xb8\x40\x77\x5a\x62\x1b\xc6\xb6\x28\x50\x94\x87\x18\xfe\xf7\x20\x48\x32\x05\xce\x78\x77\x78\xf7\xb0\xf0\x2f\x69\x65\xc9\x01\x74\xc0\xe8\xb1\xd9\x41\x94\x4f\x68\x2c\xd9\x8f\x6f\xd5\xb3\xbc\x2c\xaf\x6e\xe4\x9c\x02\x7c\x4e\xad\x1a\x69\x2f\x13\x7d\x70\x4e\x9c\xff\xdd\x4c\x86\x09\x0d\x83\x03\xc8\x38\x53\x00\xb2\x98\x3a\x29\xa4\x68\xa2\x4e\x65\xa2\x9e\xfe\x2e\x33\x16\xfe\x52\x69\xe5\x89\xca\x01\x3c\x98\x76\x8e\x6b\x1b\x8e\x14\xad\x06\xd7\xdd\x98\x1f\xd2\x85\x23\xbd\xc7\x28\x2d\xdb\x0e\x76\x6d\x6b\xc1\x48\x01\xd6\x15\xfc\xf7\x3d\xc2\xb6\xb9\x73\x00\x00\x00\xff\xff\x9d\xba\xd3\xf1\x10\x01\x00\x00") -func controlPlaneOperatorCpOperatorRoleYamlBytes() ([]byte, error) { +func etcdEtcdOperatorClusterRoleBindingYamlBytes() ([]byte, error) { return bindataRead( - _controlPlaneOperatorCpOperatorRoleYaml, - "control-plane-operator/cp-operator-role.yaml", + _etcdEtcdOperatorClusterRoleBindingYaml, + "etcd/etcd-operator-cluster-role-binding.yaml", ) } -func controlPlaneOperatorCpOperatorRoleYaml() (*asset, error) { - bytes, err := controlPlaneOperatorCpOperatorRoleYamlBytes() +func etcdEtcdOperatorClusterRoleBindingYaml() (*asset, error) { + bytes, err := etcdEtcdOperatorClusterRoleBindingYamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "control-plane-operator/cp-operator-role.yaml", size: 509, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x32, 0x26, 0x49, 0xc2, 0xda, 0xec, 0xcb, 0x40, 0xf2, 0xcf, 0x41, 0xf6, 0xff, 0x1a, 0x77, 0xe1, 0x19, 0x54, 0x39, 0xd9, 0xfa, 0xce, 0xe, 0xd0, 0xc0, 0x83, 0x32, 0x86, 0x5e, 0xa1, 0xaf, 0x7a}} + info := bindataFileInfo{name: "etcd/etcd-operator-cluster-role-binding.yaml", size: 272, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x9d, 0x48, 0x75, 0x9b, 0xcd, 0xb, 0x2, 0x44, 0xcf, 0x36, 0xc3, 0xf1, 0xd2, 0xb7, 0xa5, 0x56, 0x3c, 0x19, 0x52, 0x60, 0xd9, 0x6, 0x4c, 0x46, 0x3b, 0xe7, 0x66, 0xcd, 0x5c, 0x5a, 0x95, 0xef}} return a, nil } -var _controlPlaneOperatorCpOperatorRolebindingYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\xcd\x31\x0e\xc2\x30\x0c\x85\xe1\x3d\xa7\xf0\x05\x5a\xc4\x86\xb2\xc1\xc2\x5e\x24\x76\x37\x35\x60\x9a\xda\x91\xe3\x74\xe0\xf4\x08\x09\x89\x8d\xee\xef\x7f\x1f\x16\xbe\x92\x55\x56\x89\x60\x23\xa6\x1e\x9b\x3f\xd4\xf8\x85\xce\x2a\xfd\x7c\xa8\x3d\xeb\x6e\xdd\x87\x99\x65\x8a\x30\x68\xa6\x13\xcb\xc4\x72\x0f\x0b\x39\x4e\xe8\x18\x03\x80\xe0\x42\x11\x92\x8a\x9b\xe6\xae\x64\x14\xea\xb4\x90\xa1\xab\x05\xd3\x4c\x03\xdd\x3e\x3b\x2c\x7c\x36\x6d\xe5\x0f\x16\x00\x7e\xd6\xd6\x75\x6d\xe3\x93\x92\xd7\x18\xba\x6f\x75\x21\x5b\x39\xd1\x31\x25\x6d\xe2\x5b\xfd\x3b\x00\x00\xff\xff\xb3\xa1\x24\x6b\xff\x00\x00\x00") +var _etcdEtcdOperatorClusterRoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x91\x3f\x6f\x1b\x31\x0c\xc5\xf7\xfb\x14\xc4\x75\x2b\xe0\x2b\x8a\x2e\xc5\xad\x1d\xba\x64\x8a\x8d\xec\x3c\x89\xb6\x09\x4b\xa2\x40\x4a\x97\x3f\x9f\x3e\x90\xef\xf2\x07\x76\x80\x78\x24\xf1\x23\xdf\xe3\x23\x66\x7e\x20\x35\x96\x34\x82\x4e\xe8\x06\xac\xe5\x28\xca\x2f\x58\x58\xd2\x70\xfa\x6b\x03\xcb\xaf\xf9\x77\x77\xe2\xe4\x47\xf8\x17\xaa\x15\xd2\x7b\x09\xd4\x45\x2a\xe8\xb1\xe0\xd8\x01\x24\x8c\x34\x02\x15\xe7\x37\x92\x49\xb1\x88\x76\x5a\x03\xd9\xd8\x6d\x00\x33\xff\x57\xa9\xd9\x1a\xb9\x39\x53\x43\x1b\x9c\xd0\x68\x70\xa2\x24\x36\x38\x89\x1d\x80\x92\x49\x55\x47\x9f\x48\xb7\x28\xda\x7b\x63\x42\x77\xaa\xf9\xa3\x56\xb2\x22\x4a\xad\x31\x93\x4e\xeb\x68\xff\xb3\xbf\x56\xc6\xcc\xf4\x54\x28\xb5\x73\x6d\xbd\xed\x5a\xd5\x55\x2b\x12\xdf\x9a\x9e\xf6\x9c\xb8\x85\x71\x8b\x42\xdf\x5f\xef\xcb\xe2\x17\xb7\x46\x3a\xb3\xa3\xd5\x7a\xf2\x59\x38\x95\xa5\xca\xed\x07\x56\x28\x95\x59\x42\x8d\xe4\x02\x72\x5c\xc1\x99\x16\xea\xfb\xeb\xce\xa9\x5c\xa8\x7b\xca\x41\x9e\xe3\xd7\x3b\x7e\xc0\xee\x48\xb0\x97\x10\xe4\x91\xd3\xa1\xd9\x88\x6c\xe7\x78\xc0\x61\x82\x89\x40\x29\xca\x4c\x1e\x78\x0f\x49\x0a\x54\x6b\xdc\xf6\x0f\x2c\x6f\x00\x4c\x1e\x76\x77\xdb\xdb\x92\x30\x72\x4a\x97\x3e\x0e\x54\xba\xd7\x00\x00\x00\xff\xff\x76\x23\xaa\xf0\x86\x02\x00\x00") -func controlPlaneOperatorCpOperatorRolebindingYamlBytes() ([]byte, error) { +func etcdEtcdOperatorClusterRoleYamlBytes() ([]byte, error) { return bindataRead( - _controlPlaneOperatorCpOperatorRolebindingYaml, - "control-plane-operator/cp-operator-rolebinding.yaml", + _etcdEtcdOperatorClusterRoleYaml, + "etcd/etcd-operator-cluster-role.yaml", ) } -func controlPlaneOperatorCpOperatorRolebindingYaml() (*asset, error) { - bytes, err := controlPlaneOperatorCpOperatorRolebindingYamlBytes() +func etcdEtcdOperatorClusterRoleYaml() (*asset, error) { + bytes, err := etcdEtcdOperatorClusterRoleYamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "control-plane-operator/cp-operator-rolebinding.yaml", size: 255, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x1c, 0xd5, 0xe8, 0x7b, 0x3f, 0xc0, 0x77, 0xe7, 0x2d, 0x52, 0xc1, 0x94, 0x24, 0x55, 0x15, 0x14, 0xd0, 0x30, 0x87, 0x54, 0x10, 0xae, 0x98, 0x8f, 0xee, 0x5b, 0xb0, 0x52, 0x1d, 0x15, 0x39, 0x52}} + info := bindataFileInfo{name: "etcd/etcd-operator-cluster-role.yaml", size: 646, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x3a, 0xd3, 0xd8, 0x97, 0xce, 0x24, 0xc3, 0x77, 0xfb, 0x80, 0xc4, 0x2b, 0xd5, 0xd7, 0x8b, 0xab, 0x20, 0x51, 0xbb, 0x2c, 0xe8, 0xdf, 0xbf, 0xe3, 0x11, 0xe9, 0x5a, 0x74, 0xfb, 0xc4, 0x1c, 0xff}} return a, nil } -var _controlPlaneOperatorCpOperatorServiceaccountYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x2c\xcb\xb1\x09\x03\x31\x0c\x05\xd0\x5e\x53\x78\x01\x17\x69\xdd\x65\x83\xc0\x41\x7a\xe1\xfb\x04\x11\x59\x32\xb2\x7c\xf3\x07\xc2\xb5\x0f\x1e\x4f\x79\x23\x96\xb8\xb5\x72\x3d\xe8\x2b\x76\xb6\x72\x20\x2e\xe9\x78\xf6\xee\xdb\x92\x06\x92\x4f\x4e\x6e\x54\x8a\xf1\x40\x2b\xdd\x2d\xc3\xb5\x4e\x65\x43\xf5\x89\xe0\xf4\x20\x19\xfc\xc1\x6b\xab\x1e\xe8\x81\x5c\x8d\xea\x1d\xe6\x56\xad\xeb\xaf\xf4\x0b\x00\x00\xff\xff\x09\x7f\x7c\xcc\x73\x00\x00\x00") +var _etcdEtcdOperatorServiceaccountYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x04\xc0\xb1\x0d\xc4\x30\x08\x05\xd0\x9e\x29\x58\xe0\x8a\x6b\xe9\x32\x43\xa4\xf4\x08\xff\x02\x45\x06\x8b\x10\xcf\x9f\xa7\xcb\x2f\xd4\xe3\x19\xc2\xfb\x4f\xb7\xc7\x10\x3e\x51\xdb\x0d\x87\x59\xbe\xd1\x34\xd1\x3a\xb4\x55\x88\x39\x74\x42\x18\x6d\xe3\x97\x0b\xa5\x9d\x45\x5f\x00\x00\x00\xff\xff\xb8\xec\xa9\x1b\x44\x00\x00\x00") -func controlPlaneOperatorCpOperatorServiceaccountYamlBytes() ([]byte, error) { +func etcdEtcdOperatorServiceaccountYamlBytes() ([]byte, error) { return bindataRead( - _controlPlaneOperatorCpOperatorServiceaccountYaml, - "control-plane-operator/cp-operator-serviceaccount.yaml", + _etcdEtcdOperatorServiceaccountYaml, + "etcd/etcd-operator-serviceaccount.yaml", ) } -func controlPlaneOperatorCpOperatorServiceaccountYaml() (*asset, error) { - bytes, err := controlPlaneOperatorCpOperatorServiceaccountYamlBytes() +func etcdEtcdOperatorServiceaccountYaml() (*asset, error) { + bytes, err := etcdEtcdOperatorServiceaccountYamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "control-plane-operator/cp-operator-serviceaccount.yaml", size: 115, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x27, 0x39, 0x24, 0x5, 0xf7, 0x10, 0xca, 0xa0, 0x43, 0x2c, 0x1a, 0x95, 0xfc, 0xda, 0x53, 0x9a, 0x5c, 0xc4, 0xce, 0x91, 0x10, 0xba, 0xeb, 0x68, 0x74, 0x28, 0x12, 0x7f, 0x18, 0xaf, 0x37, 0xb9}} + info := bindataFileInfo{name: "etcd/etcd-operator-serviceaccount.yaml", size: 68, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xb2, 0x40, 0x3b, 0x9e, 0xeb, 0x77, 0x74, 0x79, 0xd, 0x93, 0x68, 0xc8, 0xbe, 0xe, 0x58, 0xa, 0xc1, 0xd0, 0x43, 0x4d, 0x1c, 0xf1, 0xb8, 0xae, 0x4f, 0x42, 0xff, 0xe, 0x39, 0x7e, 0x94, 0xdc}} return a, nil } -var _etcdEtcdClusterCrdYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x90\xb1\x6e\xf3\x30\x0c\x84\x77\x3d\x05\x5f\x20\xfa\x91\x7f\x2a\xb4\xa6\x9d\x5a\x64\xe8\xd0\x9d\x91\x59\x97\x88\x2d\x0a\x24\x15\xb4\x6f\x5f\xd8\x72\x61\xa4\xe8\x48\x1e\xef\xf4\xe9\xb0\xf2\x1b\xa9\xb1\x94\x04\x58\x99\x3e\x9d\xca\x32\x59\xbc\x3e\x58\x64\xf9\x77\x3b\x5e\xc8\xf1\x18\xae\x5c\x86\x04\xa7\x66\x2e\xf3\x2b\x99\x34\xcd\xf4\x48\xef\x5c\xd8\x59\x4a\x98\xc9\x71\x40\xc7\x14\x00\x0a\xce\x94\x80\x3c\x0f\x79\x6a\xe6\xa4\x16\x97\x21\x2e\xfa\x05\x8d\x62\x16\x25\xb1\x98\x65\x0e\x56\x29\x2f\x9e\x2c\xe5\xb6\x71\x04\x00\x00\x73\x45\xa7\xf1\x2b\xc1\x59\x0a\x05\x80\x51\xa5\xd5\x9e\xfa\x67\x50\x7f\xd6\xba\xbb\xc3\x3e\x79\x1e\x4e\x9d\x60\xdd\x4e\x6c\xfe\xfc\x5b\x79\x61\xf3\x55\xad\x53\x53\x9c\xee\xb9\x3b\xca\x87\xa8\x9f\xf7\xf0\xc3\x7a\xd2\x25\x2e\x63\x9b\x50\xef\x5c\x01\xc0\xb2\x54\x4a\xb0\x9a\x2a\x66\x5a\xae\x7f\xbe\x07\xbd\xd1\xff\xfb\x6a\xcd\x3d\x6c\xb5\xed\x2a\x80\x91\xde\x68\x48\xe0\xda\x68\x6b\x45\x14\x47\xda\x36\xdf\x01\x00\x00\xff\xff\x99\xa0\xbc\xf0\xbc\x01\x00\x00") +var _etcdEtcdOperatorYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x90\x41\x4f\x02\x31\x10\x85\xef\xfb\x2b\xe6\x0f\xb0\x48\xe2\xc5\xde\x88\xe0\x49\x90\x68\x62\xe2\x89\x8c\xdd\x87\x34\xb6\x9d\xda\x0e\x9b\xf0\xef\xcd\x0a\xae\x6c\xe2\x7a\x72\x4e\xcd\x9b\x79\xdf\x7b\x29\x27\xf7\x8c\x5c\x9c\x44\x43\x9c\x52\x99\xb6\xb3\xea\xdd\xc5\xc6\xd0\x02\xc9\xcb\x31\x20\x6a\x15\xa0\xdc\xb0\xb2\xa9\x88\x22\x07\x18\x82\xda\x66\x22\x09\x99\x55\x72\x55\x12\x6c\xb7\xcb\x48\xde\x59\x2e\x86\x66\x15\x51\x81\x87\x55\xc9\xdd\x86\x28\xb0\xda\xfd\x3d\xbf\xc2\x97\x93\xf0\x3b\x8a\x48\x11\x92\x67\xc5\xd9\x76\x11\xdd\x8d\x1f\x10\xc6\x18\x44\xdf\x95\xbe\xde\xc8\xad\xb3\x98\x5b\x2b\x87\xa8\xeb\x11\x07\x91\x95\xa8\xec\x22\x72\xcf\x9f\x8c\xf2\xbb\x71\x81\xdf\x60\xe8\xe3\xc0\xc7\xda\xc9\xd4\x4a\x86\x94\xe9\xe0\xd6\xb4\x57\xf5\x4d\x7d\xdd\x5b\xac\x84\xc0\xb1\xf9\xe9\x3f\x19\x61\x23\xb6\x97\x47\xa7\x1a\xab\x97\xed\xe6\x61\xb1\x5d\xcf\x57\xcb\xa7\xcd\xfc\x76\xd9\x1f\x10\xb5\xec\x0f\xb8\xcb\x12\xcc\x85\x48\xb4\x73\xf0\xcd\x23\x76\x43\xf5\xac\x6f\x58\xf7\xa6\xff\xe1\xba\xcb\x28\x89\x2d\xfe\xca\xfd\xff\xc8\xea\x33\x00\x00\xff\xff\x6d\x1d\x4b\x79\x83\x02\x00\x00") -func etcdEtcdClusterCrdYamlBytes() ([]byte, error) { +func etcdEtcdOperatorYamlBytes() ([]byte, error) { return bindataRead( - _etcdEtcdClusterCrdYaml, - "etcd/etcd-cluster-crd.yaml", + _etcdEtcdOperatorYaml, + "etcd/etcd-operator.yaml", ) } -func etcdEtcdClusterCrdYaml() (*asset, error) { - bytes, err := etcdEtcdClusterCrdYamlBytes() +func etcdEtcdOperatorYaml() (*asset, error) { + bytes, err := etcdEtcdOperatorYamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "etcd/etcd-cluster-crd.yaml", size: 444, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x45, 0x93, 0x34, 0xc, 0x9, 0xb9, 0xc7, 0x3, 0x46, 0x2c, 0x53, 0x30, 0x38, 0x86, 0xce, 0x84, 0x56, 0x5b, 0xa2, 0xf8, 0xfb, 0x25, 0xec, 0xb0, 0x19, 0x8, 0x76, 0x5d, 0x11, 0x39, 0x8b, 0x17}} + info := bindataFileInfo{name: "etcd/etcd-operator.yaml", size: 643, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x5e, 0xc8, 0x7e, 0xca, 0x49, 0x2f, 0x34, 0xa8, 0x96, 0xbe, 0x62, 0x64, 0x8f, 0x5a, 0x5e, 0x84, 0x45, 0x1c, 0x4c, 0xd, 0xd8, 0x90, 0x7a, 0x4d, 0xc3, 0x1e, 0x49, 0xb2, 0x74, 0x2d, 0x15, 0xf9}} return a, nil } -var _etcdEtcdClusterYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\xcd\x3f\x4f\x03\x31\x0c\x05\xf0\x3d\x9f\xc2\xea\xde\xa0\x6b\xb7\x5b\x11\x1b\x5b\x11\xbb\xcf\x79\x43\xc4\xe5\x8f\x6c\x73\x03\x9f\x1e\x85\xa8\x08\xba\xd9\x4f\x3f\x3f\x73\xcf\xef\x50\xcb\xad\xae\x04\x97\x14\x13\x3b\x6f\x6c\x88\xd2\x14\xcd\xa2\xb4\xf2\x74\x2c\x1b\x9c\x2f\xe1\x23\xd7\xb4\xd2\x8b\x4b\x7a\xde\x3f\xcd\xa1\xa1\xc0\x79\x5c\xac\x81\xa8\x72\xc1\x2c\x09\xd6\x21\x23\xb2\xfc\x85\x95\x96\x40\x74\xdc\x9f\x9c\xae\xf1\x12\x97\xeb\x29\x10\xbd\xbd\xde\x06\x22\x32\x67\xcf\x32\x67\xa2\x82\xb2\x41\xef\x1b\x51\x07\xf4\x06\x51\xf8\x6c\x3f\x8f\xe0\xec\xbb\xfd\x0a\x83\x1e\x0f\x66\x46\x7f\x54\xeb\x50\xf6\xf6\x5f\xc9\x9e\x51\xfd\x47\x7d\x07\x00\x00\xff\xff\xd6\x50\xc7\x57\x09\x01\x00\x00") +var _etcdEtcdSecretTemplateYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\xcd\x31\x0a\xc3\x30\x0c\x05\xd0\xdd\xa7\x10\x9e\xda\x21\x81\xae\xbe\x46\xa1\xbb\x70\x54\x10\x4e\x6c\x23\x8b\x42\x08\xba\x7b\x71\x48\x87\xd2\x66\xfd\xff\x3f\x29\x71\x9e\x02\xdc\x29\x0a\xa9\xc3\xca\x0f\x92\xc6\x25\x07\x78\xdd\xdc\x42\x8a\x13\x2a\x06\x07\x90\x71\xa1\x00\xdb\x06\xe3\x93\x67\x02\xb3\x41\xe7\xe6\x3e\x6d\xcf\xdb\x7e\x03\xcc\xc6\x28\xba\x4f\x6b\x62\xb8\x54\xe1\xac\x87\xf2\xbd\xf2\x57\x30\xfb\x31\x89\xd6\x33\x93\x68\xfd\x6b\x86\x88\x5f\xaf\xbc\x94\xa2\x47\xe8\xfb\xfe\x1d\x00\x00\xff\xff\xff\x43\x2d\xdd\xdc\x00\x00\x00") -func etcdEtcdClusterYamlBytes() ([]byte, error) { +func etcdEtcdSecretTemplateYamlBytes() ([]byte, error) { return bindataRead( - _etcdEtcdClusterYaml, - "etcd/etcd-cluster.yaml", + _etcdEtcdSecretTemplateYaml, + "etcd/etcd-secret-template.yaml", ) } -func etcdEtcdClusterYaml() (*asset, error) { - bytes, err := etcdEtcdClusterYamlBytes() +func etcdEtcdSecretTemplateYaml() (*asset, error) { + bytes, err := etcdEtcdSecretTemplateYamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "etcd/etcd-cluster.yaml", size: 265, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x12, 0xba, 0x60, 0x3a, 0x37, 0x96, 0x38, 0x15, 0xbd, 0x24, 0xf8, 0x69, 0xef, 0xfc, 0x88, 0x4c, 0xcd, 0x43, 0xd7, 0xe6, 0xfe, 0x16, 0xd8, 0xe9, 0xaa, 0x8, 0x45, 0x73, 0x26, 0x6b, 0x15, 0x30}} + info := bindataFileInfo{name: "etcd/etcd-secret-template.yaml", size: 220, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x51, 0x8b, 0xf9, 0x25, 0x6, 0xab, 0xaf, 0x22, 0x86, 0x63, 0xfb, 0x5d, 0x86, 0x68, 0x6b, 0xc0, 0xd6, 0xa7, 0x78, 0x5a, 0x7b, 0xd2, 0xf1, 0xb8, 0x59, 0x73, 0xe8, 0xe5, 0x71, 0x37, 0x7a, 0x1a}} return a, nil } -var _etcdEtcdOperatorClusterRoleBindingYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x7c\x8d\xb1\x6e\xc3\x30\x0c\x44\x77\x7d\x05\x7f\xc0\x2a\xba\x15\xda\xda\x0e\xdd\x3a\xb8\x40\x77\x5a\x62\x1b\xc6\xb6\x28\x50\x94\x87\x18\xfe\xf7\x20\x48\x32\x05\xce\x78\x77\x78\xf7\xb0\xf0\x2f\x69\x65\xc9\x01\x74\xc0\xe8\xb1\xd9\x41\x94\x4f\x68\x2c\xd9\x8f\x6f\xd5\xb3\xbc\x2c\xaf\x6e\xe4\x9c\x02\x7c\x4e\xad\x1a\x69\x2f\x13\x7d\x70\x4e\x9c\xff\xdd\x4c\x86\x09\x0d\x83\x03\xc8\x38\x53\x00\xb2\x98\x3a\x29\xa4\x68\xa2\x4e\x65\xa2\x9e\xfe\x2e\x33\x16\xfe\x52\x69\xe5\x89\xca\x01\x3c\x98\x76\x8e\x6b\x1b\x8e\x14\xad\x06\xd7\xdd\x98\x1f\xd2\x85\x23\xbd\xc7\x28\x2d\xdb\x0e\x76\x6d\x6b\xc1\x48\x01\xd6\x15\xfc\xf7\x3d\xc2\xb6\xb9\x73\x00\x00\x00\xff\xff\x9d\xba\xd3\xf1\x10\x01\x00\x00") +var _hostedClusterConfigOperatorCpOperatorConfigmapYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x34\xcc\xb1\x0a\xc2\x40\x0c\x00\xd0\x3d\x5f\x11\xba\x9f\x20\x38\xdd\xea\xec\xea\x2a\x31\x17\x35\xb4\x4d\x8e\xbb\xd4\xa5\xf6\xdf\xc5\x82\xfb\xe3\x51\xd5\xab\xb4\xae\x6e\x19\xdf\x47\x18\xd5\x4a\xc6\xb3\xdb\x43\x9f\x17\xaa\x30\x4b\x50\xa1\xa0\x0c\x88\x46\xb3\x64\x7c\x79\x0f\x29\x89\xa7\xa5\x87\xb4\xc4\x3b\x4d\x5e\xa5\x51\x78\x83\x3f\x56\xd3\x50\x9a\x12\xd3\x81\x5b\x64\xfc\xc0\xba\xa2\x1a\x4f\x4b\x91\x5b\x1d\x15\x07\xf6\xf9\xae\xf6\xab\x76\x32\x20\x9e\x70\xdb\xe0\x1b\x00\x00\xff\xff\xbb\x34\xae\xca\x91\x00\x00\x00") -func etcdEtcdOperatorClusterRoleBindingYamlBytes() ([]byte, error) { +func hostedClusterConfigOperatorCpOperatorConfigmapYamlBytes() ([]byte, error) { return bindataRead( - _etcdEtcdOperatorClusterRoleBindingYaml, - "etcd/etcd-operator-cluster-role-binding.yaml", + _hostedClusterConfigOperatorCpOperatorConfigmapYaml, + "hosted-cluster-config-operator/cp-operator-configmap.yaml", ) } -func etcdEtcdOperatorClusterRoleBindingYaml() (*asset, error) { - bytes, err := etcdEtcdOperatorClusterRoleBindingYamlBytes() +func hostedClusterConfigOperatorCpOperatorConfigmapYaml() (*asset, error) { + bytes, err := hostedClusterConfigOperatorCpOperatorConfigmapYamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "etcd/etcd-operator-cluster-role-binding.yaml", size: 272, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x9d, 0x48, 0x75, 0x9b, 0xcd, 0xb, 0x2, 0x44, 0xcf, 0x36, 0xc3, 0xf1, 0xd2, 0xb7, 0xa5, 0x56, 0x3c, 0x19, 0x52, 0x60, 0xd9, 0x6, 0x4c, 0x46, 0x3b, 0xe7, 0x66, 0xcd, 0x5c, 0x5a, 0x95, 0xef}} + info := bindataFileInfo{name: "hosted-cluster-config-operator/cp-operator-configmap.yaml", size: 145, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x30, 0xff, 0x8a, 0x8, 0x5, 0xd6, 0x20, 0x6d, 0xb4, 0x6c, 0x5c, 0x42, 0x10, 0xeb, 0x65, 0x8a, 0x25, 0x1c, 0x1c, 0x43, 0x4e, 0x7, 0xf3, 0x64, 0x38, 0xa2, 0x2c, 0xd5, 0xe0, 0x7e, 0x11, 0x13}} return a, nil } -var _etcdEtcdOperatorClusterRoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x91\x3f\x6f\x1b\x31\x0c\xc5\xf7\xfb\x14\xc4\x75\x2b\xe0\x2b\x8a\x2e\xc5\xad\x1d\xba\x64\x8a\x8d\xec\x3c\x89\xb6\x09\x4b\xa2\x40\x4a\x97\x3f\x9f\x3e\x90\xef\xf2\x07\x76\x80\x78\x24\xf1\x23\xdf\xe3\x23\x66\x7e\x20\x35\x96\x34\x82\x4e\xe8\x06\xac\xe5\x28\xca\x2f\x58\x58\xd2\x70\xfa\x6b\x03\xcb\xaf\xf9\x77\x77\xe2\xe4\x47\xf8\x17\xaa\x15\xd2\x7b\x09\xd4\x45\x2a\xe8\xb1\xe0\xd8\x01\x24\x8c\x34\x02\x15\xe7\x37\x92\x49\xb1\x88\x76\x5a\x03\xd9\xd8\x6d\x00\x33\xff\x57\xa9\xd9\x1a\xb9\x39\x53\x43\x1b\x9c\xd0\x68\x70\xa2\x24\x36\x38\x89\x1d\x80\x92\x49\x55\x47\x9f\x48\xb7\x28\xda\x7b\x63\x42\x77\xaa\xf9\xa3\x56\xb2\x22\x4a\xad\x31\x93\x4e\xeb\x68\xff\xb3\xbf\x56\xc6\xcc\xf4\x54\x28\xb5\x73\x6d\xbd\xed\x5a\xd5\x55\x2b\x12\xdf\x9a\x9e\xf6\x9c\xb8\x85\x71\x8b\x42\xdf\x5f\xef\xcb\xe2\x17\xb7\x46\x3a\xb3\xa3\xd5\x7a\xf2\x59\x38\x95\xa5\xca\xed\x07\x56\x28\x95\x59\x42\x8d\xe4\x02\x72\x5c\xc1\x99\x16\xea\xfb\xeb\xce\xa9\x5c\xa8\x7b\xca\x41\x9e\xe3\xd7\x3b\x7e\xc0\xee\x48\xb0\x97\x10\xe4\x91\xd3\xa1\xd9\x88\x6c\xe7\x78\xc0\x61\x82\x89\x40\x29\xca\x4c\x1e\x78\x0f\x49\x0a\x54\x6b\xdc\xf6\x0f\x2c\x6f\x00\x4c\x1e\x76\x77\xdb\xdb\x92\x30\x72\x4a\x97\x3e\x0e\x54\xba\xd7\x00\x00\x00\xff\xff\x76\x23\xaa\xf0\x86\x02\x00\x00") +var _hostedClusterConfigOperatorCpOperatorDeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x56\xcd\x6f\xe2\x38\x14\xbf\xf3\x57\x3c\x45\x73\xd8\x3d\x04\x66\xae\x96\x7a\x60\x21\xa3\x41\xd3\x52\x04\xed\x5c\x56\xab\xca\x75\x5e\xc0\xaa\x63\x67\x6c\x87\x96\x8d\xf8\xdf\x57\xce\x07\xb1\x43\x69\xb9\x6d\x4e\xe4\x7d\xfc\xde\xef\x7d\x06\x5a\xf0\x5f\xa8\x0d\x57\x92\x00\x2d\x0a\x33\xd9\x7f\x1b\xbd\x70\x99\x12\x98\x63\x21\xd4\x21\x47\x69\x47\x39\x5a\x9a\x52\x4b\xc9\x08\x40\xd2\x1c\x09\xec\x94\xb1\x98\xc6\x4c\x94\xc6\xa2\x8e\x99\x92\x19\xdf\xc6\xaa\x40\x4d\xad\xd2\x23\x53\x20\x73\xc6\x1a\x0b\xc1\x19\x35\x04\xbe\x8d\x00\x0c\x0a\x64\x56\x69\xa7\x01\xc8\xa9\x65\xbb\x5b\xfa\x8c\xc2\x34\x02\x70\x04\x3e\x85\x06\xb0\x98\x17\x82\x5a\x6c\x61\x3c\x6e\xee\x11\x01\xe2\xb5\x98\xcd\xd3\xea\x17\x73\x02\x51\x55\xc1\x78\xd6\xbd\xc3\xf1\x18\x8d\xaa\x0a\x78\x06\xe3\x35\x1a\x4b\xb5\x9d\x53\x8b\x70\x3c\x76\xcc\xa5\x54\x96\x5a\xae\xa4\x17\x5a\x15\x28\xcd\x8e\x67\x76\xcc\xd5\x44\x37\x6e\x98\x4e\x6d\x8b\x1e\x02\xd5\xf8\x28\xd3\x0e\xb3\x2b\x61\x8d\x9e\x65\x5c\x72\x7b\xe8\xa1\x0b\x95\x4e\xcf\x84\x00\x85\xc6\x0c\xb5\xc6\x74\x5e\x6a\x2e\xb7\x1b\xb6\xc3\xb4\x14\x5c\x6e\x17\x5b\xa9\x4e\xe2\xe4\x0d\x59\xe9\xb8\xfa\xae\x00\x31\xbc\x22\xdf\xee\x2c\x81\x6f\x5f\xbf\x06\x9a\x20\xde\x03\xea\x9c\x0c\xd4\x6d\xd9\x37\x41\x83\xc3\xa7\x6e\x77\xf2\x56\x68\x34\x26\x2c\x53\xc8\xe1\x05\x0f\xa4\x6f\xc4\xbb\x46\x75\x65\xeb\xce\x11\x58\xc8\x0b\x26\x7b\x2a\x4a\x34\x04\xfe\x3e\xef\xe4\x3f\x67\x2e\x56\x15\x4a\xa8\xed\xe1\xa7\x0b\x1e\xbd\x94\xcf\xa8\x25\x5a\x34\xae\x71\x6e\x76\xdc\xd0\x47\xa3\xce\x56\xb8\xe0\x61\x0e\x2d\xef\x28\x2f\x85\xe5\x31\xfd\x37\x7e\x55\xfa\x05\x75\x34\x7a\x8f\x73\x94\xfc\x2e\xa9\xf0\x75\x35\x59\x02\x91\xd5\x25\xfa\x72\xcc\x32\x64\x96\xc0\x52\xb5\xad\xc4\x6e\x0a\xef\xa8\xcb\x67\xa5\xb9\xd2\xdc\x1e\x66\x82\x1a\xd3\x4f\x63\xe1\x8b\x97\xf5\xc2\xba\x22\x5c\xf0\x09\xe7\x0e\x80\x29\x69\x29\x97\xa8\x4f\xf9\xc5\xc0\x73\xba\x6d\x51\x7e\xd4\xbb\xd4\x16\x74\x56\x6f\xd2\x7d\x9b\xda\xc2\x59\xf5\x40\x57\x1e\x8b\x36\xa3\x0f\x70\x37\xc8\x4a\x47\xd9\x87\x36\xad\x6c\xa6\xa4\xc5\x37\xeb\x8f\x93\x2e\xe5\xd4\x3c\x1a\xd4\x9f\x12\xf6\x81\x87\x65\x00\x40\xb9\xf7\x3b\xdc\x24\xb3\xba\x9f\x3f\x2d\xa7\x77\xc9\x66\x35\x9d\x25\xc3\x16\x7e\xd7\x6a\xb0\x1b\x19\x47\x91\xae\x31\x1b\x8e\x7b\x2d\x5f\x51\xbb\x23\xa7\x0b\x36\x76\x01\x4c\x41\x19\x9e\x05\xbd\x5f\x25\xcb\xcd\x8f\xc5\xf7\x87\xa7\x75\x72\x9b\x4c\x37\xc9\xd3\xaf\x64\xbd\x59\xdc\x2f\xcf\x67\xa8\xaa\x60\xdf\x1c\x74\x88\x34\x0a\xa4\x06\x23\x3f\xa9\x0e\xf2\xe7\xe3\x5f\xc9\x7a\x99\x3c\x24\x9b\xeb\xb0\xfa\xa5\x08\xe0\x98\xca\x73\x2a\x53\xbf\x4e\xd1\xa4\x34\x7a\xf2\xcc\xe5\xe4\xe3\xc6\x47\xbe\x4f\x1c\xbb\xe3\xc2\xa9\x88\x19\x8d\x33\x2e\xf0\x66\x82\x96\x4d\xfa\xa8\x93\xc6\x7b\xd2\x9b\x8d\x99\xb6\x03\x0c\x4b\xf5\x16\x6d\xec\xbc\x1a\xf3\x33\x94\x5e\xe5\xfd\x1c\xa0\x9c\xfa\x10\xc8\xbf\xfc\x11\xb4\xfe\xcf\xa8\xaa\x34\x95\x5b\x84\x2f\x6e\x61\xb4\x12\x02\x35\x90\x9b\x0f\xe7\x6d\x76\xb2\x34\x61\x4f\xa2\x38\xee\x51\xcc\x4d\x55\x79\xa0\xc7\x63\x54\x55\x28\xd3\x66\x46\x3f\x59\x95\x35\x1a\x55\x6a\x86\x01\xbe\xee\x84\xa4\xaa\xa0\x21\x7d\x2d\x46\xef\xd0\x49\xd7\xf8\xbb\x44\x63\x7d\x7c\x17\xa1\x16\x9a\x7a\x66\x1c\xc5\xd9\xea\x31\xb4\x00\x60\x45\xd9\x2c\x64\xa3\x3b\xed\x5b\x77\xd1\x30\x57\xfa\x30\x74\xca\x6b\x69\x7b\xbf\x3a\x0b\xdf\xf5\xf4\x63\x40\xf3\x96\xe7\x7c\x40\x52\x38\xd1\xff\x49\xb1\xbd\x2f\xe7\x97\x66\xaf\x44\x99\xe3\x9d\x2a\xa5\x0d\x3e\x2a\xb9\x93\x34\x57\xe2\xf2\x20\x7b\x64\x9a\xd5\x7e\x47\xf5\x21\xd4\x05\x98\x40\xdc\xfe\x7d\x59\x29\xc1\xd9\x81\xc0\x54\xbc\xd2\x83\x69\x75\x06\xf5\x9e\x33\x9c\x32\xe6\x62\x2c\xaf\xb9\xf9\x7e\xda\xde\x67\xe6\x22\x7f\x83\x4c\x63\x70\xe4\x1b\x49\x13\xac\x25\x10\x4b\xb4\xee\xbb\x1b\xd3\x34\xe7\x32\x3e\x83\x89\xdf\x4b\x0c\xda\xd7\x3b\x5a\x90\xb3\x12\x7c\x92\xc5\x7f\x01\x00\x00\xff\xff\x8e\x42\xbd\xb8\x3d\x0b\x00\x00") -func etcdEtcdOperatorClusterRoleYamlBytes() ([]byte, error) { +func hostedClusterConfigOperatorCpOperatorDeploymentYamlBytes() ([]byte, error) { return bindataRead( - _etcdEtcdOperatorClusterRoleYaml, - "etcd/etcd-operator-cluster-role.yaml", + _hostedClusterConfigOperatorCpOperatorDeploymentYaml, + "hosted-cluster-config-operator/cp-operator-deployment.yaml", ) } -func etcdEtcdOperatorClusterRoleYaml() (*asset, error) { - bytes, err := etcdEtcdOperatorClusterRoleYamlBytes() +func hostedClusterConfigOperatorCpOperatorDeploymentYaml() (*asset, error) { + bytes, err := hostedClusterConfigOperatorCpOperatorDeploymentYamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "etcd/etcd-operator-cluster-role.yaml", size: 646, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x3a, 0xd3, 0xd8, 0x97, 0xce, 0x24, 0xc3, 0x77, 0xfb, 0x80, 0xc4, 0x2b, 0xd5, 0xd7, 0x8b, 0xab, 0x20, 0x51, 0xbb, 0x2c, 0xe8, 0xdf, 0xbf, 0xe3, 0x11, 0xe9, 0x5a, 0x74, 0xfb, 0xc4, 0x1c, 0xff}} + info := bindataFileInfo{name: "hosted-cluster-config-operator/cp-operator-deployment.yaml", size: 2877, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x89, 0x52, 0x6e, 0x71, 0x1c, 0x11, 0x94, 0xcf, 0x59, 0x97, 0x56, 0xd0, 0xac, 0xb, 0xe, 0xc, 0x94, 0x46, 0x8e, 0x1f, 0x7c, 0x65, 0x33, 0x94, 0x7a, 0xa1, 0xa9, 0x4a, 0x57, 0x60, 0x54, 0x32}} return a, nil } -var _etcdEtcdOperatorServiceaccountYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x04\xc0\xb1\x0d\xc4\x30\x08\x05\xd0\x9e\x29\x58\xe0\x8a\x6b\xe9\x32\x43\xa4\xf4\x08\xff\x02\x45\x06\x8b\x10\xcf\x9f\xa7\xcb\x2f\xd4\xe3\x19\xc2\xfb\x4f\xb7\xc7\x10\x3e\x51\xdb\x0d\x87\x59\xbe\xd1\x34\xd1\x3a\xb4\x55\x88\x39\x74\x42\x18\x6d\xe3\x97\x0b\xa5\x9d\x45\x5f\x00\x00\x00\xff\xff\xb8\xec\xa9\x1b\x44\x00\x00\x00") +var _hostedClusterConfigOperatorCpOperatorRoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x90\xbf\x6e\xf3\x30\x0c\xc4\x77\x3d\x85\xe0\xf9\xb3\x83\x6f\x2b\xfc\x02\xdd\x3b\x74\x29\x3a\x30\xd2\x25\x16\x22\x8b\x02\x49\xa5\x7f\x9e\xbe\xb0\x9d\x02\x41\x53\x14\xed\x76\xa2\xee\xf0\x3b\x92\x6a\x7a\x84\x68\xe2\x32\x7a\xd9\x53\x18\xa8\xd9\xc4\x92\xde\xc9\x12\x97\xe1\x74\xa7\x43\xe2\xdd\xf9\xbf\x3b\xa5\x12\x47\xff\xc0\x19\x6e\x86\x51\x24\xa3\xd1\x79\x5f\x68\xc6\xe8\x27\x56\x43\xec\x43\x6e\x6a\x90\x3e\x70\x39\xa4\x63\xcf\x15\x42\xc6\xe2\xa4\x65\xe8\xe8\x7a\x4f\x35\xdd\x0b\xb7\xaa\x4b\xb4\xf7\x5d\xe7\xbc\x17\x28\x37\x09\xb8\xcc\xb6\xec\x4c\x55\xd7\x67\xe5\xb8\x88\x33\x64\x7f\x31\x1c\x61\xdb\x0f\x59\x98\x56\xd5\x6a\x24\xc3\x96\x16\x7c\xca\x9c\x74\x33\xbe\xac\xc6\x6b\xb8\x7f\xea\xf0\x6a\x28\xcb\xda\xda\xfd\xf3\x1d\xd5\xaa\xdd\xf3\x6d\x99\x88\x9a\xf9\x6d\x46\xb1\xbf\x94\xf8\x81\xbc\x8e\x85\x9b\x61\xe0\x8a\xa2\x53\x3a\xd8\x90\xf8\x96\xbc\x7a\xf4\x4a\xee\x42\x53\xe3\xb9\x5f\x4e\xfd\x7d\x97\x2f\xd8\xdf\xdc\x28\x22\xc3\xe0\x3e\x02\x00\x00\xff\xff\xbb\x42\x34\x68\x05\x02\x00\x00") -func etcdEtcdOperatorServiceaccountYamlBytes() ([]byte, error) { +func hostedClusterConfigOperatorCpOperatorRoleYamlBytes() ([]byte, error) { return bindataRead( - _etcdEtcdOperatorServiceaccountYaml, - "etcd/etcd-operator-serviceaccount.yaml", + _hostedClusterConfigOperatorCpOperatorRoleYaml, + "hosted-cluster-config-operator/cp-operator-role.yaml", ) } -func etcdEtcdOperatorServiceaccountYaml() (*asset, error) { - bytes, err := etcdEtcdOperatorServiceaccountYamlBytes() +func hostedClusterConfigOperatorCpOperatorRoleYaml() (*asset, error) { + bytes, err := hostedClusterConfigOperatorCpOperatorRoleYamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "etcd/etcd-operator-serviceaccount.yaml", size: 68, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xb2, 0x40, 0x3b, 0x9e, 0xeb, 0x77, 0x74, 0x79, 0xd, 0x93, 0x68, 0xc8, 0xbe, 0xe, 0x58, 0xa, 0xc1, 0xd0, 0x43, 0x4d, 0x1c, 0xf1, 0xb8, 0xae, 0x4f, 0x42, 0xff, 0xe, 0x39, 0x7e, 0x94, 0xdc}} + info := bindataFileInfo{name: "hosted-cluster-config-operator/cp-operator-role.yaml", size: 517, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xd5, 0x96, 0x43, 0x44, 0xa3, 0x7a, 0x48, 0xd, 0xe7, 0xb1, 0xf0, 0x65, 0x8f, 0x3, 0x25, 0xb8, 0x4d, 0xf8, 0xb8, 0x15, 0xc6, 0x50, 0x33, 0xaa, 0xcc, 0x5b, 0xa, 0xcb, 0xc4, 0xca, 0xa1, 0x44}} return a, nil } -var _etcdEtcdOperatorYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x90\x41\x4f\x02\x31\x10\x85\xef\xfb\x2b\xe6\x0f\xb0\x48\xe2\xc5\xde\x88\xe0\x49\x90\x68\x62\xe2\x89\x8c\xdd\x87\x34\xb6\x9d\xda\x0e\x9b\xf0\xef\xcd\x0a\xae\x6c\xe2\x7a\x72\x4e\xcd\x9b\x79\xdf\x7b\x29\x27\xf7\x8c\x5c\x9c\x44\x43\x9c\x52\x99\xb6\xb3\xea\xdd\xc5\xc6\xd0\x02\xc9\xcb\x31\x20\x6a\x15\xa0\xdc\xb0\xb2\xa9\x88\x22\x07\x18\x82\xda\x66\x22\x09\x99\x55\x72\x55\x12\x6c\xb7\xcb\x48\xde\x59\x2e\x86\x66\x15\x51\x81\x87\x55\xc9\xdd\x86\x28\xb0\xda\xfd\x3d\xbf\xc2\x97\x93\xf0\x3b\x8a\x48\x11\x92\x67\xc5\xd9\x76\x11\xdd\x8d\x1f\x10\xc6\x18\x44\xdf\x95\xbe\xde\xc8\xad\xb3\x98\x5b\x2b\x87\xa8\xeb\x11\x07\x91\x95\xa8\xec\x22\x72\xcf\x9f\x8c\xf2\xbb\x71\x81\xdf\x60\xe8\xe3\xc0\xc7\xda\xc9\xd4\x4a\x86\x94\xe9\xe0\xd6\xb4\x57\xf5\x4d\x7d\xdd\x5b\xac\x84\xc0\xb1\xf9\xe9\x3f\x19\x61\x23\xb6\x97\x47\xa7\x1a\xab\x97\xed\xe6\x61\xb1\x5d\xcf\x57\xcb\xa7\xcd\xfc\x76\xd9\x1f\x10\xb5\xec\x0f\xb8\xcb\x12\xcc\x85\x48\xb4\x73\xf0\xcd\x23\x76\x43\xf5\xac\x6f\x58\xf7\xa6\xff\xe1\xba\xcb\x28\x89\x2d\xfe\xca\xfd\xff\xc8\xea\x33\x00\x00\xff\xff\x6d\x1d\x4b\x79\x83\x02\x00\x00") +var _hostedClusterConfigOperatorCpOperatorRolebindingYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\xcd\xb1\xae\xc2\x30\x0c\x85\xe1\x3d\x4f\x91\x17\x48\xaf\xee\x86\xb2\xc1\xc2\x5e\x24\x76\x37\x71\x5b\xd3\xd6\x8e\x1c\xa7\x03\x4f\x8f\x90\x90\xd8\x50\xf7\x73\xfe\x0f\x0a\xdd\x51\x2b\x09\x47\xaf\x03\xa4\x0e\x9a\xcd\xa2\xf4\x04\x23\xe1\x6e\x39\xd5\x8e\xe4\x6f\xff\x77\x0b\x71\x8e\xbe\x97\x15\x2f\xc4\x99\x78\x72\x1b\x1a\x64\x30\x88\xce\x7b\x86\x0d\xa3\x9f\xa5\x1a\xe6\x90\xd6\x56\x0d\x35\x24\xe1\x91\xa6\x20\x05\x15\x4c\xd4\xa9\xac\xd8\xe3\xf8\xde\x43\xa1\xab\x4a\x2b\x3f\x50\xe7\xfd\xd7\x3c\x4a\xd4\x36\x3c\x30\x59\x8d\x2e\x7c\xde\x37\xd4\x9d\x12\x9e\x53\x92\xc6\x76\xb4\xf3\x0a\x00\x00\xff\xff\x02\x27\x4c\x3f\x17\x01\x00\x00") -func etcdEtcdOperatorYamlBytes() ([]byte, error) { +func hostedClusterConfigOperatorCpOperatorRolebindingYamlBytes() ([]byte, error) { return bindataRead( - _etcdEtcdOperatorYaml, - "etcd/etcd-operator.yaml", + _hostedClusterConfigOperatorCpOperatorRolebindingYaml, + "hosted-cluster-config-operator/cp-operator-rolebinding.yaml", ) } -func etcdEtcdOperatorYaml() (*asset, error) { - bytes, err := etcdEtcdOperatorYamlBytes() +func hostedClusterConfigOperatorCpOperatorRolebindingYaml() (*asset, error) { + bytes, err := hostedClusterConfigOperatorCpOperatorRolebindingYamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "etcd/etcd-operator.yaml", size: 643, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x5e, 0xc8, 0x7e, 0xca, 0x49, 0x2f, 0x34, 0xa8, 0x96, 0xbe, 0x62, 0x64, 0x8f, 0x5a, 0x5e, 0x84, 0x45, 0x1c, 0x4c, 0xd, 0xd8, 0x90, 0x7a, 0x4d, 0xc3, 0x1e, 0x49, 0xb2, 0x74, 0x2d, 0x15, 0xf9}} + info := bindataFileInfo{name: "hosted-cluster-config-operator/cp-operator-rolebinding.yaml", size: 279, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xf5, 0xe6, 0x3e, 0xc9, 0x90, 0x2d, 0xef, 0xee, 0x3c, 0x4b, 0x39, 0x7a, 0x8e, 0x20, 0x47, 0x96, 0xa0, 0xfb, 0xdc, 0xe1, 0x0, 0x68, 0xa7, 0x4, 0x82, 0xb2, 0x13, 0x28, 0xf, 0x2d, 0xf9, 0x2f}} return a, nil } -var _etcdEtcdSecretTemplateYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\xcd\x31\x0a\xc3\x30\x0c\x05\xd0\xdd\xa7\x10\x9e\xda\x21\x81\xae\xbe\x46\xa1\xbb\x70\x54\x10\x4e\x6c\x23\x8b\x42\x08\xba\x7b\x71\x48\x87\xd2\x66\xfd\xff\x3f\x29\x71\x9e\x02\xdc\x29\x0a\xa9\xc3\xca\x0f\x92\xc6\x25\x07\x78\xdd\xdc\x42\x8a\x13\x2a\x06\x07\x90\x71\xa1\x00\xdb\x06\xe3\x93\x67\x02\xb3\x41\xe7\xe6\x3e\x6d\xcf\xdb\x7e\x03\xcc\xc6\x28\xba\x4f\x6b\x62\xb8\x54\xe1\xac\x87\xf2\xbd\xf2\x57\x30\xfb\x31\x89\xd6\x33\x93\x68\xfd\x6b\x86\x88\x5f\xaf\xbc\x94\xa2\x47\xe8\xfb\xfe\x1d\x00\x00\xff\xff\xff\x43\x2d\xdd\xdc\x00\x00\x00") +var _hostedClusterConfigOperatorCpOperatorServiceaccountYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x2c\xcb\x31\x0a\x42\x31\x0c\x06\xe0\x3d\xa7\xe8\x05\x3a\xb8\x76\xf3\x06\xc2\x03\xf7\x90\xfe\x3e\x83\x6d\x53\xd2\xf4\x9d\x5f\x10\xd7\x0f\x3e\x9e\xfa\x84\x2f\xb5\x51\xd2\x75\xa3\x8f\x8e\x5a\xd2\x01\xbf\x54\x70\x17\xb1\x3d\x82\x3a\x82\x2b\x07\x17\x4a\x69\x70\x47\x49\x6f\x5b\x81\x9a\xa5\xed\x15\xf0\x2c\x36\x5e\x7a\x66\x9b\x70\x0e\x73\xd2\xce\x27\x1e\xbb\xb5\x03\xe2\x88\x55\x28\xff\xe3\xdc\xad\xe5\xf5\x53\xfa\x06\x00\x00\xff\xff\xa8\xe8\x0b\x51\x7b\x00\x00\x00") -func etcdEtcdSecretTemplateYamlBytes() ([]byte, error) { +func hostedClusterConfigOperatorCpOperatorServiceaccountYamlBytes() ([]byte, error) { return bindataRead( - _etcdEtcdSecretTemplateYaml, - "etcd/etcd-secret-template.yaml", + _hostedClusterConfigOperatorCpOperatorServiceaccountYaml, + "hosted-cluster-config-operator/cp-operator-serviceaccount.yaml", ) } -func etcdEtcdSecretTemplateYaml() (*asset, error) { - bytes, err := etcdEtcdSecretTemplateYamlBytes() +func hostedClusterConfigOperatorCpOperatorServiceaccountYaml() (*asset, error) { + bytes, err := hostedClusterConfigOperatorCpOperatorServiceaccountYamlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "etcd/etcd-secret-template.yaml", size: 220, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x51, 0x8b, 0xf9, 0x25, 0x6, 0xab, 0xaf, 0x22, 0x86, 0x63, 0xfb, 0x5d, 0x86, 0x68, 0x6b, 0xc0, 0xd6, 0xa7, 0x78, 0x5a, 0x7b, 0xd2, 0xf1, 0xb8, 0x59, 0x73, 0xe8, 0xe5, 0x71, 0x37, 0x7a, 0x1a}} + info := bindataFileInfo{name: "hosted-cluster-config-operator/cp-operator-serviceaccount.yaml", size: 123, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xdb, 0x69, 0xc0, 0xa2, 0xef, 0x14, 0x4b, 0x34, 0x2e, 0x1, 0x5a, 0x79, 0xdd, 0x77, 0x4f, 0x72, 0x1b, 0x66, 0x71, 0xe1, 0xb6, 0x59, 0x50, 0x6a, 0xc4, 0xc, 0x32, 0x88, 0xce, 0xc, 0xc0, 0x96}} return a, nil } @@ -3442,11 +3442,6 @@ var _bindata = map[string]func() (*asset, error){ "cluster-bootstrap/node-bootstrapper-clusterrolebinding.yaml": clusterBootstrapNodeBootstrapperClusterrolebindingYaml, "cluster-version-operator/cluster-version-operator-deployment.yaml": clusterVersionOperatorClusterVersionOperatorDeploymentYaml, "common/service-network-admin-kubeconfig-secret.yaml": commonServiceNetworkAdminKubeconfigSecretYaml, - "control-plane-operator/cp-operator-configmap.yaml": controlPlaneOperatorCpOperatorConfigmapYaml, - "control-plane-operator/cp-operator-deployment.yaml": controlPlaneOperatorCpOperatorDeploymentYaml, - "control-plane-operator/cp-operator-role.yaml": controlPlaneOperatorCpOperatorRoleYaml, - "control-plane-operator/cp-operator-rolebinding.yaml": controlPlaneOperatorCpOperatorRolebindingYaml, - "control-plane-operator/cp-operator-serviceaccount.yaml": controlPlaneOperatorCpOperatorServiceaccountYaml, "etcd/etcd-cluster-crd.yaml": etcdEtcdClusterCrdYaml, "etcd/etcd-cluster.yaml": etcdEtcdClusterYaml, "etcd/etcd-operator-cluster-role-binding.yaml": etcdEtcdOperatorClusterRoleBindingYaml, @@ -3454,6 +3449,11 @@ var _bindata = map[string]func() (*asset, error){ "etcd/etcd-operator-serviceaccount.yaml": etcdEtcdOperatorServiceaccountYaml, "etcd/etcd-operator.yaml": etcdEtcdOperatorYaml, "etcd/etcd-secret-template.yaml": etcdEtcdSecretTemplateYaml, + "hosted-cluster-config-operator/cp-operator-configmap.yaml": hostedClusterConfigOperatorCpOperatorConfigmapYaml, + "hosted-cluster-config-operator/cp-operator-deployment.yaml": hostedClusterConfigOperatorCpOperatorDeploymentYaml, + "hosted-cluster-config-operator/cp-operator-role.yaml": hostedClusterConfigOperatorCpOperatorRoleYaml, + "hosted-cluster-config-operator/cp-operator-rolebinding.yaml": hostedClusterConfigOperatorCpOperatorRolebindingYaml, + "hosted-cluster-config-operator/cp-operator-serviceaccount.yaml": hostedClusterConfigOperatorCpOperatorServiceaccountYaml, "hypershift-operator/hypershift-operator-configmap.yaml": hypershiftOperatorHypershiftOperatorConfigmapYaml, "ignition-configs/20-apiserver-haproxy.yaml": ignitionConfigs20ApiserverHaproxyYaml, "ignition-configs/99-worker-ssh.yaml": ignitionConfigs99WorkerSshYaml, @@ -3653,13 +3653,6 @@ var _bintree = &bintree{nil, map[string]*bintree{ "common": {nil, map[string]*bintree{ "service-network-admin-kubeconfig-secret.yaml": {commonServiceNetworkAdminKubeconfigSecretYaml, map[string]*bintree{}}, }}, - "control-plane-operator": {nil, map[string]*bintree{ - "cp-operator-configmap.yaml": {controlPlaneOperatorCpOperatorConfigmapYaml, map[string]*bintree{}}, - "cp-operator-deployment.yaml": {controlPlaneOperatorCpOperatorDeploymentYaml, map[string]*bintree{}}, - "cp-operator-role.yaml": {controlPlaneOperatorCpOperatorRoleYaml, map[string]*bintree{}}, - "cp-operator-rolebinding.yaml": {controlPlaneOperatorCpOperatorRolebindingYaml, map[string]*bintree{}}, - "cp-operator-serviceaccount.yaml": {controlPlaneOperatorCpOperatorServiceaccountYaml, map[string]*bintree{}}, - }}, "etcd": {nil, map[string]*bintree{ "etcd-cluster-crd.yaml": {etcdEtcdClusterCrdYaml, map[string]*bintree{}}, "etcd-cluster.yaml": {etcdEtcdClusterYaml, map[string]*bintree{}}, @@ -3669,6 +3662,13 @@ var _bintree = &bintree{nil, map[string]*bintree{ "etcd-operator.yaml": {etcdEtcdOperatorYaml, map[string]*bintree{}}, "etcd-secret-template.yaml": {etcdEtcdSecretTemplateYaml, map[string]*bintree{}}, }}, + "hosted-cluster-config-operator": {nil, map[string]*bintree{ + "cp-operator-configmap.yaml": {hostedClusterConfigOperatorCpOperatorConfigmapYaml, map[string]*bintree{}}, + "cp-operator-deployment.yaml": {hostedClusterConfigOperatorCpOperatorDeploymentYaml, map[string]*bintree{}}, + "cp-operator-role.yaml": {hostedClusterConfigOperatorCpOperatorRoleYaml, map[string]*bintree{}}, + "cp-operator-rolebinding.yaml": {hostedClusterConfigOperatorCpOperatorRolebindingYaml, map[string]*bintree{}}, + "cp-operator-serviceaccount.yaml": {hostedClusterConfigOperatorCpOperatorServiceaccountYaml, map[string]*bintree{}}, + }}, "hypershift-operator": {nil, map[string]*bintree{ "hypershift-operator-configmap.yaml": {hypershiftOperatorHypershiftOperatorConfigmapYaml, map[string]*bintree{}}, }}, diff --git a/hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-configmap.yaml b/hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-configmap.yaml similarity index 73% rename from hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-configmap.yaml rename to hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-configmap.yaml index 74ca78b62b78..3edef96fe48d 100644 --- a/hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-configmap.yaml +++ b/hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-configmap.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: control-plane-operator + name: hosted-cluster-config-operator data: initial-ca.crt: | {{ include_pki "combined-ca.crt" 4 }} diff --git a/hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-deployment.yaml b/hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-deployment.yaml similarity index 74% rename from hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-deployment.yaml rename to hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-deployment.yaml index 463bf0e5c30b..c10c4bbb94d9 100644 --- a/hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-deployment.yaml +++ b/hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-deployment.yaml @@ -1,16 +1,16 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: control-plane-operator + name: hosted-cluster-config-operator spec: replicas: 1 selector: matchLabels: - app: control-plane-operator + app: hosted-cluster-config-operator template: metadata: labels: - app: control-plane-operator + app: hosted-cluster-config-operator clusterID: "{{ .ClusterID }}" {{ if .RestartDate }} annotations: @@ -37,11 +37,11 @@ spec: priorityClassName: {{ .MasterPriorityClass }} {{ end }} containers: - - image: {{ .ControlPlaneOperatorImage }} - name: control-plane-operator -{{ if .ControlPlaneOperatorSecurity }} + - image: {{ .HostedClusterConfigOperatorImage }} + name: hosted-cluster-config-operator +{{ if .HostedClusterConfigOperatorSecurity }} securityContext: - runAsUser: {{ .ControlPlaneOperatorSecurity }} + runAsUser: {{ .HostedClusterConfigOperatorSecurity }} {{ end }} env: - name: POD_NAMESPACE @@ -53,14 +53,14 @@ spec: - name: KUBERNETES_VERSION value: {{ version "kubernetes" }} command: - - "/usr/bin/control-plane-operator" + - "/usr/bin/hosted-cluster-config-operator" - "--initial-ca-file=/etc/kubernetes/config/initial-ca.crt" - "--target-kubeconfig=/etc/kubernetes/kubeconfig/kubeconfig" - "--namespace" - - "$(POD_NAMESPACE)"{{range $controller := .ControlPlaneOperatorControllers }} + - "$(POD_NAMESPACE)"{{range $controller := .HostedClusterConfigOperatorControllers }} - "--controllers={{$controller}}"{{end}} -{{ if .ControlPlaneOperatorResources }} - resources:{{ range .ControlPlaneOperatorResources }}{{ range .ResourceRequest }} +{{ if .HostedClusterConfigOperatorResources }} + resources:{{ range .HostedClusterConfigOperatorResources }}{{ range .ResourceRequest }} requests: {{ if .CPU }} cpu: {{ .CPU }}{{ end }}{{ if .Memory }} memory: {{ .Memory }}{{ end }}{{ end }}{{ range .ResourceLimit }} @@ -74,11 +74,11 @@ spec: - mountPath: /etc/kubernetes/config name: config restartPolicy: Always - serviceAccountName: control-plane-operator + serviceAccountName: hosted-cluster-config-operator volumes: - name: kubeconfig secret: secretName: service-network-admin-kubeconfig - name: config configMap: - name: control-plane-operator + name: hosted-cluster-config-operator diff --git a/hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-role.yaml b/hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-role.yaml similarity index 92% rename from hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-role.yaml rename to hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-role.yaml index 8371ec2e4bec..047cde5b023c 100644 --- a/hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-role.yaml +++ b/hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-role.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: control-plane-operator + name: hosted-cluster-config-operator rules: - apiGroups: - "" diff --git a/hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-rolebinding.yaml b/hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-rolebinding.yaml similarity index 58% rename from hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-rolebinding.yaml rename to hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-rolebinding.yaml index 80561797428c..c8052268965d 100644 --- a/hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-rolebinding.yaml +++ b/hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-rolebinding.yaml @@ -1,11 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: control-plane-operator + name: hosted-cluster-config-operator roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: control-plane-operator + name: hosted-cluster-config-operator subjects: - kind: ServiceAccount - name: control-plane-operator + name: hosted-cluster-config-operator diff --git a/hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-serviceaccount.yaml b/hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-serviceaccount.yaml similarity index 68% rename from hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-serviceaccount.yaml rename to hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-serviceaccount.yaml index 3583483c51a7..3e6a180a700c 100644 --- a/hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-serviceaccount.yaml +++ b/hypershift-operator/assets/controlplane/hypershift/hosted-cluster-config-operator/cp-operator-serviceaccount.yaml @@ -1,6 +1,6 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: control-plane-operator + name: hosted-cluster-config-operator imagePullSecrets: - name: pull-secret diff --git a/hypershift-operator/controllers/controlplane.go b/hypershift-operator/controllers/controlplane.go index af7b701f2dae..63d063d658d0 100644 --- a/hypershift-operator/controllers/controlplane.go +++ b/hypershift-operator/controllers/controlplane.go @@ -61,9 +61,9 @@ var ( func (r *HostedControlPlaneReconciler) generateControlPlaneManifests(ctx context.Context, hcp *hyperv1.HostedControlPlane, infraStatus InfrastructureStatus, releaseImage *releaseinfo.ReleaseImage) (map[string][]byte, error) { targetNamespace := hcp.GetName() - controlPlaneOperatorImage, err := r.LookupControlPlaneOperatorImage(r.Client) + hostedClusterConfigOperatorImage, err := r.LookupHostedClusterConfigOperatorImage(r.Client) if err != nil { - return nil, fmt.Errorf("failed to lookup control plane operator image: %w", err) + return nil, fmt.Errorf("failed to lookup hosted cluster config operator image: %w", err) } var sshKeySecret corev1.Secret err = r.Client.Get(ctx, client.ObjectKey{Namespace: hcp.Namespace, Name: hcp.Spec.SSHKey.Name}, &sshKeySecret) @@ -104,7 +104,7 @@ func (r *HostedControlPlaneReconciler) generateControlPlaneManifests(ctx context params.ImageRegistryHTTPSecret = generateImageRegistrySecret() params.Replicas = "1" params.SSHKey = string(sshKeyData) - params.ControlPlaneOperatorImage = controlPlaneOperatorImage + params.HostedClusterConfigOperatorImage = hostedClusterConfigOperatorImage params.HypershiftOperatorControllers = []string{"route-sync", "auto-approver", "kubeadmin-password", "node"} // Generate PKI data just once and store it in a secret. PKI generation isn't diff --git a/hypershift-operator/controllers/hosted_controlplane_controller.go b/hypershift-operator/controllers/hosted_controlplane_controller.go index 55affe30f70d..753e74a24c14 100644 --- a/hypershift-operator/controllers/hosted_controlplane_controller.go +++ b/hypershift-operator/controllers/hosted_controlplane_controller.go @@ -24,11 +24,11 @@ import ( type HostedControlPlaneReconciler struct { client.Client - Log logr.Logger - Infra *configv1.Infrastructure - recorder record.EventRecorder - LookupControlPlaneOperatorImage func(kubeClient client.Client) (string, error) - ReleaseProvider releaseinfo.Provider + Log logr.Logger + Infra *configv1.Infrastructure + recorder record.EventRecorder + LookupHostedClusterConfigOperatorImage func(kubeClient client.Client) (string, error) + ReleaseProvider releaseinfo.Provider } func (r *HostedControlPlaneReconciler) SetupWithManager(mgr ctrl.Manager) error { diff --git a/hypershift-operator/main.go b/hypershift-operator/main.go index 8fa954401ce7..1c4204383109 100644 --- a/hypershift-operator/main.go +++ b/hypershift-operator/main.go @@ -87,13 +87,13 @@ func NewStartCommand() *cobra.Command { var metricsAddr string var enableLeaderElection bool - var controlPlaneOperatorImage string + var hostedClusterConfigOperatorImage string cmd.Flags().StringVar(&metricsAddr, "metrics-addr", "0", "The address the metric endpoint binds to.") cmd.Flags().BoolVar(&enableLeaderElection, "enable-leader-election", false, "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") - cmd.Flags().StringVar(&controlPlaneOperatorImage, "control-plane-operator-image", "", "A control plane operator image.") + cmd.Flags().StringVar(&hostedClusterConfigOperatorImage, "hosted-cluster-config-operator-image", "", "A hosted cluster config operator image.") cmd.Run = func(cmd *cobra.Command, args []string) { ctrl.SetLogger(zap.New(zap.UseDevMode(true))) @@ -109,12 +109,12 @@ func NewStartCommand() *cobra.Command { os.Exit(1) } - // Add some flexibility to getting the control plane operator image. Use the + // Add some flexibility to getting the hosted cluster config operator image. Use the // flag if given, but if that's empty and we're running in a deployment, use the // hypershift operator's image for the control plane by default. - lookupControlPlaneOperatorImage := func(kubeClient client.Client) (string, error) { - if len(controlPlaneOperatorImage) > 0 { - return controlPlaneOperatorImage, nil + lookupHostedClusterConfigOperatorImage := func(kubeClient client.Client) (string, error) { + if len(hostedClusterConfigOperatorImage) > 0 { + return hostedClusterConfigOperatorImage, nil } deployment := appsv1.Deployment{} err := kubeClient.Get(context.TODO(), client.ObjectKey{Namespace: "hypershift", Name: "operator"}, &deployment) @@ -151,8 +151,8 @@ func NewStartCommand() *cobra.Command { } if err := (&controllers.HostedControlPlaneReconciler{ - Client: mgr.GetClient(), - LookupControlPlaneOperatorImage: lookupControlPlaneOperatorImage, + Client: mgr.GetClient(), + LookupHostedClusterConfigOperatorImage: lookupHostedClusterConfigOperatorImage, ReleaseProvider: &releaseinfo.PodProvider{ Pods: kubeClient.CoreV1().Pods("hypershift"), }, diff --git a/hypershift-operator/render/controlplane/hypershift/manifests.go b/hypershift-operator/render/controlplane/hypershift/manifests.go index 8f2ab1f6038c..91e72cd37d38 100644 --- a/hypershift-operator/render/controlplane/hypershift/manifests.go +++ b/hypershift-operator/render/controlplane/hypershift/manifests.go @@ -76,7 +76,7 @@ func (c *clusterManifestContext) setupManifests() { c.oauthAPIServer() c.openshiftControllerManager() c.clusterBootstrap() - c.controlPlaneOperator() + c.hostedClusterConfigOperator() c.oauthOpenshiftServer() c.openVPN() c.registry() @@ -93,13 +93,13 @@ func (c *clusterManifestContext) serviceAdminKubeconfig() { ) } -func (c *clusterManifestContext) controlPlaneOperator() { +func (c *clusterManifestContext) hostedClusterConfigOperator() { c.addManifestFiles( - "control-plane-operator/cp-operator-serviceaccount.yaml", - "control-plane-operator/cp-operator-role.yaml", - "control-plane-operator/cp-operator-rolebinding.yaml", - "control-plane-operator/cp-operator-deployment.yaml", - "control-plane-operator/cp-operator-configmap.yaml", + "hosted-cluster-config-operator/cp-operator-serviceaccount.yaml", + "hosted-cluster-config-operator/cp-operator-role.yaml", + "hosted-cluster-config-operator/cp-operator-rolebinding.yaml", + "hosted-cluster-config-operator/cp-operator-deployment.yaml", + "hosted-cluster-config-operator/cp-operator-configmap.yaml", ) } diff --git a/hypershift-operator/render/controlplane/hypershift/types.go b/hypershift-operator/render/controlplane/hypershift/types.go index e0e45a16fbf6..a1de8c3bf12b 100644 --- a/hypershift-operator/render/controlplane/hypershift/types.go +++ b/hypershift-operator/render/controlplane/hypershift/types.go @@ -39,63 +39,63 @@ type PKIParams struct { } type ClusterParams struct { - Namespace string `json:"namespace"` - ExternalAPIDNSName string `json:"externalAPIDNSName"` - ExternalAPIAddress string `json:"externalAPIAddress"` - ExternalAPIPort uint `json:"externalAPIPort"` - ExternalOpenVPNAddress string `json:"externalVPNAddress"` - ExternalOpenVPNPort uint `json:"externalVPNPort"` - ExternalOauthDNSName string `json:"externalOauthDNSName"` - ExternalOauthPort uint `json:"externalOauthPort"` - IdentityProviders string `json:"identityProviders"` - ServiceCIDR string `json:"serviceCIDR"` - NamedCerts []NamedCert `json:"namedCerts,omitempty"` - PodCIDR string `json:"podCIDR"` - ReleaseImage string `json:"releaseImage"` - IngressSubdomain string `json:"ingressSubdomain"` - OpenShiftAPIClusterIP string `json:"openshiftAPIClusterIP"` - OauthAPIClusterIP string `json:"oauthAPIClusterIP"` - ImageRegistryHTTPSecret string `json:"imageRegistryHTTPSecret"` - RouterNodePortHTTP string `json:"routerNodePortHTTP"` - RouterNodePortHTTPS string `json:"routerNodePortHTTPS"` - BaseDomain string `json:"baseDomain"` - NetworkType string `json:"networkType"` - Replicas string `json:"replicas"` - EtcdClientName string `json:"etcdClientName"` - OriginReleasePrefix string `json:"originReleasePrefix"` - OpenshiftAPIServerCABundle string `json:"openshiftAPIServerCABundle"` - OauthAPIServerCABundle string `json:"oauthAPIServerCABundle"` - CloudProvider string `json:"cloudProvider"` - CVOSetupImage string `json:"cvoSetupImage"` - InternalAPIPort uint `json:"internalAPIPort"` - RouterServiceType string `json:"routerServiceType"` - KubeAPIServerResources []ResourceRequirements `json:"kubeAPIServerResources"` - OpenshiftControllerManagerResources []ResourceRequirements `json:"openshiftControllerManagerResources"` - ClusterVersionOperatorResources []ResourceRequirements `json:"clusterVersionOperatorResources"` - KubeControllerManagerResources []ResourceRequirements `json:"kubeControllerManagerResources"` - OpenshiftAPIServerResources []ResourceRequirements `json:"openshiftAPIServerResources"` - KubeSchedulerResources []ResourceRequirements `json:"kubeSchedulerResources"` - ControlPlaneOperatorResources []ResourceRequirements `json:"controlPlaneOperatorResources"` - OAuthServerResources []ResourceRequirements `json:"oAuthServerResources"` - ClusterPolicyControllerResources []ResourceRequirements `json:"clusterPolicyControllerResources"` - AutoApproverResources []ResourceRequirements `json:"autoApproverResources"` - OpenVPNClientResources []ResourceRequirements `json:"openVPNClientResources"` - OpenVPNServerResources []ResourceRequirements `json:"openVPNServerResources"` - APIServerAuditEnabled bool `json:"apiServerAuditEnabled"` - RestartDate string `json:"restartDate"` - ControlPlaneOperatorImage string `json:"controlPlaneOperatorImage"` - ControlPlaneOperatorControllers []string `json:"controlPlaneOperatorControllers"` - ROKSMetricsImage string `json:"roksMetricsImage"` - ExtraFeatureGates []string `json:"extraFeatureGates"` - ControlPlaneOperatorSecurity string `json:"controlPlaneOperatorSecurity"` - ApiserverLivenessPath string `json:"apiserverLivenessPath"` - PlatformType string `json:"platformType"` - HypershiftOperatorImage string `json:"hypershiftOperatorImage"` - HypershiftOperatorResources []ResourceRequirements `json:"hypershiftOperatorResourceRequirements"` - HypershiftOperatorControllers []string `json:"hypershiftOperatorControllers"` - MachineConfigServerAddress string `json:"machineConfigServerAddress"` - SSHKey string `json:"sshKey"` - DefaultFeatureGates []string + Namespace string `json:"namespace"` + ExternalAPIDNSName string `json:"externalAPIDNSName"` + ExternalAPIAddress string `json:"externalAPIAddress"` + ExternalAPIPort uint `json:"externalAPIPort"` + ExternalOpenVPNAddress string `json:"externalVPNAddress"` + ExternalOpenVPNPort uint `json:"externalVPNPort"` + ExternalOauthDNSName string `json:"externalOauthDNSName"` + ExternalOauthPort uint `json:"externalOauthPort"` + IdentityProviders string `json:"identityProviders"` + ServiceCIDR string `json:"serviceCIDR"` + NamedCerts []NamedCert `json:"namedCerts,omitempty"` + PodCIDR string `json:"podCIDR"` + ReleaseImage string `json:"releaseImage"` + IngressSubdomain string `json:"ingressSubdomain"` + OpenShiftAPIClusterIP string `json:"openshiftAPIClusterIP"` + OauthAPIClusterIP string `json:"oauthAPIClusterIP"` + ImageRegistryHTTPSecret string `json:"imageRegistryHTTPSecret"` + RouterNodePortHTTP string `json:"routerNodePortHTTP"` + RouterNodePortHTTPS string `json:"routerNodePortHTTPS"` + BaseDomain string `json:"baseDomain"` + NetworkType string `json:"networkType"` + Replicas string `json:"replicas"` + EtcdClientName string `json:"etcdClientName"` + OriginReleasePrefix string `json:"originReleasePrefix"` + OpenshiftAPIServerCABundle string `json:"openshiftAPIServerCABundle"` + OauthAPIServerCABundle string `json:"oauthAPIServerCABundle"` + CloudProvider string `json:"cloudProvider"` + CVOSetupImage string `json:"cvoSetupImage"` + InternalAPIPort uint `json:"internalAPIPort"` + RouterServiceType string `json:"routerServiceType"` + KubeAPIServerResources []ResourceRequirements `json:"kubeAPIServerResources"` + OpenshiftControllerManagerResources []ResourceRequirements `json:"openshiftControllerManagerResources"` + ClusterVersionOperatorResources []ResourceRequirements `json:"clusterVersionOperatorResources"` + KubeControllerManagerResources []ResourceRequirements `json:"kubeControllerManagerResources"` + OpenshiftAPIServerResources []ResourceRequirements `json:"openshiftAPIServerResources"` + KubeSchedulerResources []ResourceRequirements `json:"kubeSchedulerResources"` + HostedClusterConfigOperatorResources []ResourceRequirements `json:"hostedClusterConfigOperatorResources"` + OAuthServerResources []ResourceRequirements `json:"oAuthServerResources"` + ClusterPolicyControllerResources []ResourceRequirements `json:"clusterPolicyControllerResources"` + AutoApproverResources []ResourceRequirements `json:"autoApproverResources"` + OpenVPNClientResources []ResourceRequirements `json:"openVPNClientResources"` + OpenVPNServerResources []ResourceRequirements `json:"openVPNServerResources"` + APIServerAuditEnabled bool `json:"apiServerAuditEnabled"` + RestartDate string `json:"restartDate"` + HostedClusterConfigOperatorImage string `json:"hostedClusterConfigOperatorImage"` + HostedClusterConfigOperatorControllers []string `json:"hostedClusterConfigOperatorControllers"` + ROKSMetricsImage string `json:"roksMetricsImage"` + ExtraFeatureGates []string `json:"extraFeatureGates"` + HostedClusterConfigOperatorSecurity string `json:"hostedClusterConfigOperatorSecurity"` + ApiserverLivenessPath string `json:"apiserverLivenessPath"` + PlatformType string `json:"platformType"` + HypershiftOperatorImage string `json:"hypershiftOperatorImage"` + HypershiftOperatorResources []ResourceRequirements `json:"hypershiftOperatorResourceRequirements"` + HypershiftOperatorControllers []string `json:"hypershiftOperatorControllers"` + MachineConfigServerAddress string `json:"machineConfigServerAddress"` + SSHKey string `json:"sshKey"` + DefaultFeatureGates []string // Fields below are are taken from the ROKs type EndpointPublishingStrategyScope string `json:"endpointPublishingStrategyScope"` diff --git a/test/e2e/quick_start_test.go b/test/e2e/quick_start_test.go index d2ab547f8017..c4a41d6bbfa2 100644 --- a/test/e2e/quick_start_test.go +++ b/test/e2e/quick_start_test.go @@ -110,7 +110,7 @@ func QuickStartSpec(ctx context.Context, inputGetter func() QuickStartSpecInput) guestKubeConfigSecret := &corev1.Secret{} Eventually(func() bool { key := ctrl.ObjectKey{ - Namespace: cluster.GetNamespace(), + Namespace: cluster.GetName(), Name: cluster.Name + "-kubeconfig", } if err := input.Client.Get(ctx, key, guestKubeConfigSecret); err != nil { @@ -174,7 +174,7 @@ func QuickStartSpec(ctx context.Context, inputGetter func() QuickStartSpecInput) return false } return false - }, 5*time.Minute, 1*time.Second).Should(BeTrue(), "couldn't clean up example cluster namespace") + }, 10*time.Minute, 1*time.Second).Should(BeTrue(), "couldn't clean up example cluster namespace") log.Logf("Waiting for the cluster resource to be deleted") Eventually(func() bool { @@ -190,7 +190,7 @@ func QuickStartSpec(ctx context.Context, inputGetter func() QuickStartSpecInput) return false } return false - }, 5*time.Minute, 1*time.Second).Should(BeTrue(), "couldn't clean up example cluster") + }, 10*time.Minute, 1*time.Second).Should(BeTrue(), "couldn't clean up example cluster") } }) }