Merge pull request #11 from oracle-samples/upjet-update

Update the oci crossplane provider with Upjet

Author: kssaril

.gitignore

@@ -0,0 +1,2 @@
+.work/
+.cache/

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+## Code of Conduct
+
+Upjet is under [the Apache 2.0 license](LICENSE) with [notice](NOTICE).

Makefile

@@ -1,18 +1,21 @@
 # ====================================================================================
 # Setup Project
 
-PROJECT_NAME := provider-jet-oci
-PROJECT_REPO := github.com/crossplane-contrib/$(PROJECT_NAME)
+PROJECT_NAME := provider-oci
+PROJECT_REPO := github.com/oracle/$(PROJECT_NAME)
 
-export TERRAFORM_VERSION := 1.1.6
+export TERRAFORM_VERSION := 1.3.3
 
 export TERRAFORM_PROVIDER_SOURCE := oracle/oci
-export TERRAFORM_PROVIDER_VERSION := 4.96.0
+export TERRAFORM_PROVIDER_REPO := https://github.com/oracle/terraform-provider-oci
+export TERRAFORM_PROVIDER_VERSION := 4.112.0
 export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-oci
-export TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX := https://releases.hashicorp.com/terraform-provider-oci/4.96.0
-export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-oci_v4.96.0 
+export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-oci_v4.112.0
+export TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX := https://releases.hashicorp.com/terraform-provider-oci/4.112.0
+export TERRAFORM_DOCS_PATH := website/docs/r
 
-PLATFORMS ?= linux_amd64 linux_arm64
+#PLATFORMS ?= linux_amd64 linux_arm64
+PLATFORMS ?= darwin_amd64
 
 # -include will silently skip missing files, which allows us
 # to load those files with a target in the Makefile. If only
@@ -37,24 +40,46 @@ NPROCS ?= 1
 # to half the number of CPU cores.
 GO_TEST_PARALLEL := $(shell echo $$(( $(NPROCS) / 2 )))
 
-GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/provider
+GO_REQUIRED_VERSION ?= 1.19
+GOLANGCILINT_VERSION ?= 1.50.0
+GO_STATIC_PACKAGES = $(GO_PROJECT)/cmd/provider $(GO_PROJECT)/cmd/generator
 GO_LDFLAGS += -X $(GO_PROJECT)/internal/version.Version=$(VERSION)
 GO_SUBDIRS += cmd internal apis
-GO111MODULE = on
 -include build/makelib/golang.mk
 
 # ====================================================================================
 # Setup Kubernetes tools
 
+KIND_VERSION = v0.15.0
+UP_VERSION = v0.14.0
+UP_CHANNEL = stable
+UPTEST_VERSION = v0.2.1
 -include build/makelib/k8s_tools.mk
 
 # ====================================================================================
 # Setup Images
 
-#DOCKER_REGISTRY ?= crossplane
-DOCKER_REGISTRY = hyd.ocir.io/axddifxif86p
-IMAGES = provider-jet-oci provider-jet-oci-controller
--include build/makelib/image.mk
+REGISTRY_ORGS ?= xpkg.upbound.io/upbound
+IMAGES = $(PROJECT_NAME)
+-include build/makelib/imagelight.mk
+
+# ====================================================================================
+# Setup XPKG
+
+XPKG_REG_ORGS ?= xpkg.upbound.io/upbound
+# NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are
+# inferred.
+XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/upbound
+XPKGS = $(PROJECT_NAME)
+-include build/makelib/xpkg.mk
+
+# NOTE(hasheddan): we force image building to happen prior to xpkg build so that
+# we ensure image is present in daemon.
+xpkg.build.provider-oci: do.build.images
+
+# NOTE(hasheddan): we ensure up is installed prior to running platform-specific
+# build steps in parallel to avoid encountering an installation race condition.
+build.init: $(UP)
 
 # ====================================================================================
 # Fallthrough
@@ -93,9 +118,16 @@ $(TERRAFORM_PROVIDER_SCHEMA): $(TERRAFORM)
 	@$(TERRAFORM) -chdir=$(TERRAFORM_WORKDIR) providers schema -json=true > $(TERRAFORM_PROVIDER_SCHEMA) 2>> $(TERRAFORM_WORKDIR)/terraform-logs.txt
 	@$(OK) generating provider schema for $(TERRAFORM_PROVIDER_SOURCE) $(TERRAFORM_PROVIDER_VERSION)
 
-generate.init: $(TERRAFORM_PROVIDER_SCHEMA)
+pull-docs:
+	@if [ ! -d "$(WORK_DIR)/$(TERRAFORM_PROVIDER_SOURCE)" ]; then \
+  		mkdir -p "$(WORK_DIR)/$(TERRAFORM_PROVIDER_SOURCE)" && \
+		git clone -c advice.detachedHead=false --depth 1 --filter=blob:none --branch "v$(TERRAFORM_PROVIDER_VERSION)" --sparse "$(TERRAFORM_PROVIDER_REPO)" "$(WORK_DIR)/$(TERRAFORM_PROVIDER_SOURCE)"; \
+	fi
+	@git -C "$(WORK_DIR)/$(TERRAFORM_PROVIDER_SOURCE)" sparse-checkout set "$(TERRAFORM_DOCS_PATH)"
+
+generate.init: $(TERRAFORM_PROVIDER_SCHEMA) pull-docs
 
-.PHONY: $(TERRAFORM_PROVIDER_SCHEMA)
+.PHONY: $(TERRAFORM_PROVIDER_SCHEMA) pull-docs
 # ====================================================================================
 # Targets
 
@@ -126,7 +158,26 @@ submodules:
 run: go.build
 	@$(INFO) Running Crossplane locally out-of-cluster . . .
 	@# To see other arguments that can be provided, run the command with --help instead
-	$(GO_OUT_DIR)/provider --debug
+	UPBOUND_CONTEXT="local" $(GO_OUT_DIR)/provider --debug
+
+# ====================================================================================
+# End to End Testing
+CROSSPLANE_NAMESPACE = upbound-system
+-include build/makelib/local.xpkg.mk
+-include build/makelib/controlplane.mk
+
+uptest: $(UPTEST) $(KUBECTL) $(KUTTL)
+	@$(INFO) running automated tests
+	@KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) $(UPTEST) e2e "${UPTEST_EXAMPLE_LIST}" --setup-script=cluster/test/setup.sh || $(FAIL)
+	@$(OK) running automated tests
+
+local-deploy: build controlplane.up local.xpkg.deploy.provider.$(PROJECT_NAME)
+	@$(INFO) running locally built provider
+	@$(KUBECTL) wait provider.pkg $(PROJECT_NAME) --for condition=Healthy --timeout 5m
+	@$(KUBECTL) -n upbound-system wait --for=condition=Available deployment --all --timeout=5m
+	@$(OK) running locally built provider
+
+e2e: local-deploy uptest
 
 .PHONY: cobertura submodules fallthrough run crds.clean
 

OWNERS.md

@@ -10,5 +10,5 @@ guidelines and responsibilities for the steering committee and maintainers.
 
 ## Maintainers
 
-* Maintainer 1 <[email protected]> ([maintainer1](https://github.com/maintainer1))
+* Saril Sudhakaran <[email protected]> ([saril sudhakaran](https://github.com/kssaril))
 * Maintainer 2 <[email protected]> ([maintainer1](https://github.com/maintainer2))

README.md

@@ -1,32 +1,52 @@
-# Terrajet Oci Provider
+# Provider Oci
 
-`provider-jet-oci` is a [Crossplane](https://crossplane.io/) provider that
-is built using [Terrajet](https://github.com/crossplane/terrajet) code
+`provider-oci` is a [Crossplane](https://crossplane.io/) provider that
+is built using [Upjet](https://github.com/upbound/upjet) code
 generation tools and exposes XRM-conformant managed resources for the
 Oci API.
 
-## Installing the provider
+## Getting Started
 
-Install the provider by using the following steps and commands
+### Testing the provider 
 
-Build the provider and push to docker registry
+Follow the below steps for generating the code and test.
+Make sure go is installed and path is set for the go binaries
 ```
-make all
-```
-
-After pushing to the docker registry run the below command to install the provider
-`repoName` is the docker registry repo to which the image is pushed.
+Git clone the repo 
+cd provider-oci/
+make generate # This will generate the binaries and CRDs.
+kubectl apply -f package/crds  #  A k8s cluster must be available running locally
+make run # This will start crossplane provider against the local kubernetes cluster .
 ```
-kubectl crossplane install provider <repoName> /provider-jet-oci:v0.1.0
+In another terminal run the below commands to test the provider. 
+Make sure to setup the OCI credentials in examples/providerconfig/secret.yaml using the template examples/providerconfig/secret.yaml.tmpl
 ```
 
-Alternatively, you can use declarative installation:
+# Create "crossplane-system" namespace if not exists
+kubectl create namespace crossplane-system --dry-run=client -o yaml | kubectl apply -f -
+
+kubectl apply -f examples/providerconfig/
+kubectl apply -f examples/identity/compartment.yaml  # open the compartment.yaml and update the compartment id in wich the new compartment to be created
+kubectl get managed # To check the status
 ```
-kubectl apply -f examples/install.yaml
+## Building the provider and package as docker image
 ```
+make build # This will build docker image in local machie. This can be pushed to any container registry
 
-Notice that in this example Provider resource is referencing ControllerConfig with debug enabled.
+```
 
+## Installing the provider from a container registry 
+using declarative api
+```
+cat <<EOF | kubectl apply -f -
+apiVersion: pkg.crossplane.io/v1
+kind: Provider
+metadata:
+  name: provider-oci
+spec:
+  package: <registry>/provider-oci:<tag>
+EOF
+```
 
 ## Developing
 
@@ -56,24 +76,8 @@ make build
 ## Report a Bug
 
 For filing bugs, suggesting improvements, or requesting new features, please
-open an [issue](https://github.com/crossplane-contrib/provider-jet-oci/issues).
-
-## Contact
-
-Please use the following to reach members of the community:
-
-* Slack: Join our [slack channel](https://slack.crossplane.io)
-* Forums:
-  [crossplane-dev](https://groups.google.com/forum/#!forum/crossplane-dev)
-* Twitter: [@crossplane_io](https://twitter.com/crossplane_io)
-* Email: [[email protected]](mailto:[email protected])
-
-## Governance and Owners
+open an [issue](https://github.com/oracle-samples/provider-oci/issues).
 
-provider-jet-oci is run according to the same
-[Governance](https://github.com/crossplane/crossplane/blob/master/GOVERNANCE.md)
-and [Ownership](https://github.com/crossplane/crossplane/blob/master/OWNERS.md)
-structure as the core Crossplane project.
 
 ## Contributing
 

THIRD_PARTY_LICENSES.txt

@@ -1,8 +1,11 @@
 === Public License Template ===
-# Terrajet Template Provider
-github.com/crossplane-contrib/provider-jet-template
+# upjet Provider Template 
+github.com/upbound/upjet-provider-template
+github.com/upbound/upjet/pkg
+
+Copyright 2022 Upbound Inc. All rights reserved.
+Copyright 2023 Upbound Inc. All rights reserved.
 
-Copyright 2020 The Crossplane Authors.
 -------- License
                                  Apache License
                            Version 2.0, January 2004
@@ -192,7 +195,7 @@ Copyright 2020 The Crossplane Authors.
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016 The Crossplane Authors. All rights reserved.
+   Copyright 2023 Upbound Inc. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -205,4 +208,3 @@ Copyright 2020 The Crossplane Authors.
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-