diff --git a/Makefile b/Makefile index 28583f5..4332908 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 0.0.1 +VERSION ?= v0.0.1 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") @@ -28,8 +28,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) # This variable is used to construct full image tags for bundle and catalog images. # # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both -# kwasm.sh/kwasm-provisioner-operator-bundle:$VERSION and kwasm.sh/kwasm-provisioner-operator-catalog:$VERSION. -IMAGE_TAG_BASE ?= kwasm.sh/kwasm-provisioner-operator +# kwasm/kwasm-operator-bundle:$VERSION and kwasm/kwasm-operator-catalog:$VERSION. +IMAGE_TAG_BASE ?= ghcr.io/kwasm/kwasm-operator # BUNDLE_IMG defines the image:tag used for the bundle. # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=/:) @@ -87,7 +87,7 @@ help: ## Display this help. .PHONY: manifests manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. - $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases + $(CONTROLLER_GEN) rbac:roleName=manager-role webhook paths="./..." output:artifacts .PHONY: generate generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. diff --git a/PROJECT b/PROJECT index 54eaa36..013abcb 100644 --- a/PROJECT +++ b/PROJECT @@ -4,8 +4,8 @@ layout: plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} -projectName: kwasm-provisioner-operator -repo: github.com/kwasm/kwasm-provisioner-operator +projectName: kwasm-operator +repo: github.com/kwasm/kwasm-operator resources: - controller: true group: batch diff --git a/README.md b/README.md index 1266099..18f8835 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# kwasm-provisioner-operator +# kwasm-operator This Kubernetes Operators installs WebAssembly support on your Kubernetes Nodes ## Example diff --git a/config/crd/bases/wasm.kwasm.sh_provisioners.yaml b/config/crd/bases/wasm.kwasm.sh_provisioners.yaml deleted file mode 100644 index 6ca06dc..0000000 --- a/config/crd/bases/wasm.kwasm.sh_provisioners.yaml +++ /dev/null @@ -1,50 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null - name: provisioners.wasm.kwasm.sh -spec: - group: wasm.kwasm.sh - names: - kind: Provisioner - listKind: ProvisionerList - plural: provisioners - singular: provisioner - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: Provisioner is the Schema for the provisioners API - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: ProvisionerSpec defines the desired state of Provisioner - properties: - foo: - description: Foo is an example field of Provisioner. Edit provisioner_types.go - to remove/update - type: string - type: object - status: - description: ProvisionerStatus defines the observed state of Provisioner - type: object - type: object - served: true - storage: true - subresources: - status: {} diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 6aef872..fd3bf82 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,12 +1,12 @@ # Adds namespace to all resources. -namespace: kwasm-provisioner-operator-system +namespace: kwasm-operator-system # Value of this field is prepended to the # names of all resources, e.g. a deployment named # "wordpress" becomes "alices-wordpress". # Note that it should also match with the prefix (text before '-') of the namespace # field above. -namePrefix: kwasm-provisioner-operator- +namePrefix: kwasm-operator- # Labels to add to all resources and selectors. #commonLabels: diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml index 5be297a..49f20f6 100644 --- a/config/manifests/kustomization.yaml +++ b/config/manifests/kustomization.yaml @@ -1,7 +1,7 @@ # These resources constitute the fully configured set of manifests # used to generate the 'manifests/' directory in a bundle. resources: -- bases/kwasm-provisioner-operator.clusterserviceversion.yaml +- bases/kwasm-operator.clusterserviceversion.yaml - ../default - ../samples - ../scorecard diff --git a/go.mod b/go.mod index 04f5f63..7a33980 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kwasm/kwasm-provisioner-operator +module github.com/kwasm/kwasm-operator go 1.18 diff --git a/main.go b/main.go index e1f8e81..43b8172 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/kwasm/kwasm-provisioner-operator/controllers" + "github.com/kwasm/kwasm-operator/controllers" //+kubebuilder:scaffold:imports )