Skip to content

Commit

Permalink
Makefile, samples: minor cleanup/fixes
Browse files Browse the repository at this point in the history
- 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 <joe.lanford@gmail.com>
  • Loading branch information
joelanford committed May 16, 2024
1 parent 55c19a1 commit a7e83e4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions config/samples/olm_v1alpha1_clusterextension.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ kind: ClusterExtension
metadata:
name: clusterextension-sample
spec:
installNamespace: default
packageName: argocd-operator
version: 0.6.0
13 changes: 0 additions & 13 deletions config/samples/olm_v1alpha1_extension.yaml

This file was deleted.

0 comments on commit a7e83e4

Please sign in to comment.