From 57858457866d0e6c56d2f1a67571d71861fe1940 Mon Sep 17 00:00:00 2001 From: Jason Tang Date: Wed, 25 Oct 2023 16:26:28 -0400 Subject: [PATCH 1/3] Publish to crossplane-contrib on Upbound registry Also adds supported object annotations for the Upbound Marketplace listing. Signed-off-by: Jason Tang --- Makefile | 7 +++---- package/crossplane.yaml | 8 ++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9599b73..8b32f09 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,6 @@ GO_SUBDIRS += cmd internal apis # Setup Kubernetes tools KIND_VERSION = v0.15.0 -UP_VERSION = v0.18.0 UP_CHANNEL = stable UPTEST_VERSION = v0.5.0 -include build/makelib/k8s_tools.mk @@ -59,17 +58,17 @@ UPTEST_VERSION = v0.5.0 # ==================================================================================== # Setup Images -REGISTRY_ORGS ?= xpkg.upbound.io/upbound +REGISTRY_ORGS ?= xpkg.upbound.io/crossplane-contrib IMAGES = $(PROJECT_NAME) -include build/makelib/imagelight.mk # ==================================================================================== # Setup XPKG -XPKG_REG_ORGS ?= xpkg.upbound.io/upbound +XPKG_REG_ORGS ?= xpkg.upbound.io/crossplane-contrib # NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are # inferred. -XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/upbound +XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/crossplane-contrib XPKGS = $(PROJECT_NAME) -include build/makelib/xpkg.mk diff --git a/package/crossplane.yaml b/package/crossplane.yaml index c0922f1..759d328 100644 --- a/package/crossplane.yaml +++ b/package/crossplane.yaml @@ -2,3 +2,11 @@ apiVersion: meta.pkg.crossplane.io/v1 kind: Provider metadata: name: provider-okta + annotations: + meta.crossplane.io/maintainer: + meta.crossplane.io/source: github.com/crossplane-contrib/provider-okta + meta.crossplane.io/license: Apache-2.0 + meta.crossplane.io/description: | + A Crossplane provider that exposes managed resources for the Okta API. + meta.crossplane.io/readme: | + From 8d9748466aa6501f59bceaf25c406fcc24af6ab4 Mon Sep 17 00:00:00 2001 From: Jason Tang Date: Wed, 25 Oct 2023 16:36:05 -0400 Subject: [PATCH 2/3] make generate updated file. Signed-off-by: Jason Tang --- apis/app/v1alpha1/zz_groupassignment_types.go | 1 + 1 file changed, 1 insertion(+) diff --git a/apis/app/v1alpha1/zz_groupassignment_types.go b/apis/app/v1alpha1/zz_groupassignment_types.go index 906fa2f..6496e81 100755 --- a/apis/app/v1alpha1/zz_groupassignment_types.go +++ b/apis/app/v1alpha1/zz_groupassignment_types.go @@ -41,6 +41,7 @@ type GroupAssignmentParameters struct { // Group associated with the application // +crossplane:generate:reference:type=github.com/healthcarecom/provider-okta/apis/group/v1alpha1.Group + // +crossplane:generate:reference:extractor=github.com/healthcarecom/provider-okta/apis/group/v1alpha1.GroupID() // +kubebuilder:validation:Optional GroupID *string `json:"groupId,omitempty" tf:"group_id,omitempty"` From b1c2cac20eb85f646236813a4f6e3a223b4f3e26 Mon Sep 17 00:00:00 2001 From: Renato Jop <92553742+rjop-hccgt@users.noreply.github.com> Date: Wed, 25 Oct 2023 14:49:25 -0600 Subject: [PATCH 3/3] Update crossplane.yaml --- package/crossplane.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/crossplane.yaml b/package/crossplane.yaml index 759d328..cc473a4 100644 --- a/package/crossplane.yaml +++ b/package/crossplane.yaml @@ -3,10 +3,15 @@ kind: Provider metadata: name: provider-okta annotations: - meta.crossplane.io/maintainer: + meta.crossplane.io/maintainer: Healthcare meta.crossplane.io/source: github.com/crossplane-contrib/provider-okta meta.crossplane.io/license: Apache-2.0 meta.crossplane.io/description: | A Crossplane provider that exposes managed resources for the Okta API. meta.crossplane.io/readme: | - + Provider Okta is a crossplane provider for [Okta](https://okta.com) that allows + the creation of kubernetes objects for: + - Okta Users + - Okta Groups + - Assigning Users to Groups + - Assigning Apps to Groups