From 028bd67399e2fee4bc64e39b0bd84ec49504b3d7 Mon Sep 17 00:00:00 2001 From: Joe Lanford Date: Thu, 16 May 2024 15:36:09 -0400 Subject: [PATCH] Makefile, samples: minor cleanup/fixes (#866) - remove the Extension CR sample (we recently removed that entire API and controller from the project) - in the ClusterExtension CR sample, add .spec.installNamespace (we recently added that as a required field) - In the Makefile, allow KIND_CLUSTER_VERSION to be provided from the environment Signed-off-by: Joe Lanford --- Makefile | 3 +++ config/samples/olm_v1alpha1_clusterextension.yaml | 1 + config/samples/olm_v1alpha1_extension.yaml | 13 ------------- 3 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 config/samples/olm_v1alpha1_extension.yaml diff --git a/Makefile b/Makefile index 10f656b6c..2571eadab 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,10 @@ endif # bingo manages consistent tooling versions for things like kind, kustomize, etc. include .bingo/Variables.mk +ifeq ($(origin KIND_CLUSTER_NAME), undefined) KIND_CLUSTER_NAME := operator-controller +endif + # Not guaranteed to have patch releases available and node image tags are full versions (i.e v1.28.0 - no v1.28, v1.29, etc.) # The KIND_NODE_VERSION is set by getting the version of the k8s.io/client-go dependency from the go.mod # and sets major version to "1" and the patch version to "0". For example, a client-go version of v0.28.5 diff --git a/config/samples/olm_v1alpha1_clusterextension.yaml b/config/samples/olm_v1alpha1_clusterextension.yaml index 73ac97722..483ef34f1 100644 --- a/config/samples/olm_v1alpha1_clusterextension.yaml +++ b/config/samples/olm_v1alpha1_clusterextension.yaml @@ -3,5 +3,6 @@ kind: ClusterExtension metadata: name: clusterextension-sample spec: + installNamespace: default packageName: argocd-operator version: 0.6.0 diff --git a/config/samples/olm_v1alpha1_extension.yaml b/config/samples/olm_v1alpha1_extension.yaml deleted file mode 100644 index bc6ee22b2..000000000 --- a/config/samples/olm_v1alpha1_extension.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: olm.operatorframework.io/v1alpha1 -kind: Extension -metadata: - name: extension-sample - namespace: extension-namespace -spec: - paused: false - serviceAccountName: extension-sa - source: - sourceType: package - package: - name: argocd-operator - version: 0.6.0