From ce6da9fc4bdb8a8acdf7b563bdf709e5c4ae387c Mon Sep 17 00:00:00 2001 From: a Date: Wed, 30 Mar 2022 00:44:51 -0500 Subject: [PATCH] working --- config/crd/kustomization.yaml | 3 ++- config/crd/kustomizeconfig.yaml | 4 ++-- config/default/kustomization.yaml | 4 ++-- config/manager/kustomization.yaml | 4 ++-- config/prometheus/kustomization.yaml | 3 ++- config/samples/seaweed_v1_seaweed.yaml | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 22b863e..082b051 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -6,8 +6,9 @@ resources: # +kubebuilder:scaffold:crdkustomizeresource patchesStrategicMerge: -- patches/webhook_in_seaweeds.yaml - patches/cainjection_in_seaweeds.yaml + ## no conversion + #- patches/webhook_in_seaweeds.yaml # the following config is for teaching kustomize how to do kustomization for CRDs. configurations: diff --git a/config/crd/kustomizeconfig.yaml b/config/crd/kustomizeconfig.yaml index 6f83d9a..8e2d8d6 100644 --- a/config/crd/kustomizeconfig.yaml +++ b/config/crd/kustomizeconfig.yaml @@ -5,12 +5,12 @@ nameReference: fieldSpecs: - kind: CustomResourceDefinition group: apiextensions.k8s.io - path: spec/conversion/webhookClientConfig/service/name + path: spec/conversion/webhook/clientConfig/service/name namespace: - kind: CustomResourceDefinition group: apiextensions.k8s.io - path: spec/conversion/webhookClientConfig/service/namespace + path: spec/conversion/webhook/clientConfig/service/namespace create: false varReference: diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 8f4e5de..9c4c51b 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -33,7 +33,7 @@ vars: objref: kind: Certificate group: cert-manager.io - version: v1alpha2 + version: v1 name: serving-cert # this name should match the one in certificate.yaml fieldref: fieldpath: metadata.namespace @@ -41,7 +41,7 @@ vars: objref: kind: Certificate group: cert-manager.io - version: v1alpha2 + version: v1 name: serving-cert # this name should match the one in certificate.yaml - name: SERVICE_NAMESPACE # namespace of the service objref: diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index adc095b..c322d48 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: chrislusf/seaweedfs-operator - newTag: v0.0.1 + newName: gfxlabs/seaweedfs-operator + newTag: v0.0.2 diff --git a/config/prometheus/kustomization.yaml b/config/prometheus/kustomization.yaml index ed13716..81b4951 100644 --- a/config/prometheus/kustomization.yaml +++ b/config/prometheus/kustomization.yaml @@ -1,2 +1,3 @@ resources: -- monitor.yaml + ## uncomment below to enable monitor + #- monitor.yaml diff --git a/config/samples/seaweed_v1_seaweed.yaml b/config/samples/seaweed_v1_seaweed.yaml index a811187..d0fce8e 100644 --- a/config/samples/seaweed_v1_seaweed.yaml +++ b/config/samples/seaweed_v1_seaweed.yaml @@ -1,8 +1,8 @@ apiVersion: seaweed.seaweedfs.com/v1 kind: Seaweed metadata: - name: seaweed1 - namespace: default + name: seaweed-test + namespace: seaweed spec: # Add fields here image: chrislusf/seaweedfs:2.96