Import of the ORD example

.github/workflows/github-actions-apeiora-ows3.yml

@@ -0,0 +1,102 @@
+name: GitHub Actions ApeiroRA OWS3
+run-name: ${{ github.actor }} is testing out apeirora GitHub Actions
+on: [push]
+jobs:
+  ApeiroRA-OWS3-GitHub-Actions:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "🎉 The job is running on a ${{ runner.os }} server and was automatically triggered by a ${{ github.event_name }} event."
+      - run: echo "🔎 The name of the branch is ${{ github.ref }} and repository is ${{ github.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
+      - name: Run tests using make
+        run: make tmptest
+      - name: Check and install make
+        run: |
+          if ! command -v make &> /dev/null
+          then
+            echo "make could not be found, installing..."
+            sudo apt-get update
+            sudo apt-get install -y make
+          else
+            echo "make is already installed"
+          fi
+
+      - name: Check and install kubectl
+        run: |
+          if ! command -v kubectl &> /dev/null
+          then
+            echo "kubectl could not be found, installing..."
+            curl -Lo kubectl https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
+            chmod +x kubectl
+            sudo mv kubectl /usr/local/bin/
+          else
+            echo "kubectl is already installed"
+          fi
+
+      - name: Check and install uuidgen and then set GCTL_SESSION_ID
+        run: |
+          if ! command -v uuidgen &> /dev/null
+          then
+            echo "uuidgen could not be found, installing..."
+            sudo apt-get update
+            sudo apt-get install -y uuid-runtime
+          else
+            echo "uuidgen is already installed"
+          fi
+          echo "GCTL_SESSION_ID=$(uuidgen)" >> $GITHUB_ENV
+
+      - name: Check and install brew, gardenctl and kubelogin; publish afterwards
+        run: |
+          if ! command -v brew &> /dev/null
+          then
+            echo "brew could not be found, installing..."
+            /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+            (echo; echo 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"') >> /home/runner/.bashrc
+            eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+            echo 'export PATH="${BREW_ROOT:-$HOME/linuxbrew/.linuxbrew}/bin:$PATH"' >> $GITHUB_ENV
+            echo 'export PATH="${BREW_ROOT:-$HOME/linuxbrew/.linuxbrew}/sbin:$PATH"' >> $GITHUB_ENV
+          else
+            echo "brew is already installed"
+          fi
+
+          if ! command -v gardenctl &> /dev/null
+          then
+            echo "gardenctl could not be found, installing..."
+            brew install gardener/tap/gardenctl-v2
+            echo 'export PATH="${GARDENCTL_ROOT:-$HOME/linuxbrew/.linuxbrew}/bin/gardenctl:$PATH"' >> $GITHUB_ENV
+          else
+            echo "gardenctl is already installed"
+          fi
+
+          if ! command -v gardenlogin &> /dev/null
+          then
+            echo "gardenlogin could not be found, installing..."
+            brew install gardener/tap/gardenlogin
+          else
+            echo "gardenlogin is already installed"
+          fi
+
+          if ! command -v kubelogin &> /dev/null
+          then
+            echo "kubelogin could not be found, installing..."
+            brew install int128/kubelogin/kubelogin
+          else
+            echo "kubelogin is already installed"
+          fi
+
+          make k8
+        env:
+          GARDEN_OWS3_PATH: ${{ secrets.GARDEN_OWS3_PATH }}
+          K8_CLUSTER_PATH: ${{ secrets.K8_CLUSTER_PATH }}
+          ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
+          ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
+          JF_URL: ${{ secrets.JF_URL }}
+
+      # - name: Apply Kubernetes configuration
+      #   run: |
+      #     make k8-apply
+      #   env:
+      #     K8_CLUSTER_PATH: ${{ secrets.K8_CLUSTER_PATH }}
+      - run: echo "🍏 This job's status is ${{ job.status }}."

.gitignore

@@ -1,4 +1,4 @@
-.github
+# .github
 server
 xr
 .cmds

.kube/kubeconfig-garden-ows3.yaml

@@ -0,0 +1,33 @@
+kind: Config
+apiVersion: v1
+clusters:
+  - name: garden-ows3
+    cluster:
+      server: https://api.canary.gardener.cloud.sap
+      timeouts: 
+        request-timeout: "600s"
+contexts:
+  - context:
+      cluster: garden-ows3
+      user: oidc-login
+      namespace: garden-ows3
+    name: garden-ows3
+current-context: garden-ows3
+users:
+  - name: oidc-login
+    user:
+      exec:
+        apiVersion: client.authentication.k8s.io/v1beta1
+        command: kubectl
+        args:
+          - oidc-login
+          - get-token
+          - '--oidc-issuer-url=https://gardener-live.accounts.ondemand.com'
+          - '--oidc-client-id=9adf0114-225e-4dc8-a6e7-ad6556722825'
+          - '--oidc-extra-scope=email'
+          - '--oidc-extra-scope=profile'
+          - '--oidc-extra-scope=offline_access'
+          - '--oidc-use-pkce'
+          - '--grant-type=auto'
+          - '--skip-open-browser'
+preferences: {}

.kube/kubeconfig-gardenlogin--ows3--ytdzgvnl69.yaml

@@ -0,0 +1,74 @@
+apiVersion: v1
+kind: Config
+current-context: garden-ows3--ytdzgvnl69-external
+contexts:
+  - name: garden-ows3--ytdzgvnl69-external
+    context:
+      cluster: garden-ows3--ytdzgvnl69-external
+      user: garden-ows3--ytdzgvnl69
+      namespace: default
+  - name: garden-ows3--ytdzgvnl69-internal
+    context:
+      cluster: garden-ows3--ytdzgvnl69-internal
+      user: garden-ows3--ytdzgvnl69
+      namespace: default
+clusters:
+  - name: garden-ows3--ytdzgvnl69-external
+    cluster:
+      server: https://api.ytdzgvnl69.ows3.shoot.canary.k8s-hana.ondemand.com
+      certificate-authority-data: >-
+        LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQ1akNDQWs2Z0F3SUJBZ0lRTndjNUFHSTFIZStJTmthY1RSYm5QVEFOQmdrcWhraUc5dzBCQVFzRkFEQU4KTVFzd0NRWURWUVFERXdKallUQWVGdzB5TkRBMU1qTXdPRFEyTURkYUZ3MHpOREExTWpNd09EUTJNRGRhTUEweApDekFKQmdOVkJBTVRBbU5oTUlJQm9qQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FZOEFNSUlCaWdLQ0FZRUE1R2tQCkF5Y0hTNStVaE9tTG9xdkRQOEZwSjZIUXFqbUo0QmV2TDdvV01XNEdNNnIzNHRjazhkR0pBMnhMUVplWkVGbWMKREhMV0xFT08xZDh5bEV6WVZvMmtROTlsbklyRkREcDFka21qblgrekkrUWRRTDVkalJBSllFSytFK1lRbTU1cAo5bVhsUFVTVTZramtqSkpVakhhK2VGakwvZjZhMU1DNEdLZEhnendDMWJZM3JIeHFqRGlOQ08vVzhpMExrbUNjCktnM0lrRStRaXk4OGdMaTRwVkVjUElZa1hGanJoUTkxWWUxWGVDTkk3L3U3dktvbWNWUjlxN3A2T2QwN3ZBWGIKS1U4UDNKUG00bVVwMExWd3J6TzYySWlQVkhkbXhYYURHMTZPTklET2tJQXFZTkRxYjdYSW5UK2pMQjRtSXJlZwo5bTIrYzE3ZU9XNkpKeXhyUjZOa1JOZEE2R0lDNlJxYnFsckEySmVFOEFvTVVTNVVwV0pzcElEa210L08yWjJaClk3cTVyeFFlckJDQVJtbklkMFk1YVVEQ3RjdFFnWHVCbXJpZFltRzQwb25QRGJ6ZzcxdFlSWUlhV0N1Z1lGY1EKdmtETWV4cXRTNGZVOXM3L3JsQURVUHVQaTV3SEJQaXpPVzU0Y1pjQlYzRXZndUpnckZyRDNVaHMrN2N0QWdNQgpBQUdqUWpCQU1BNEdBMVVkRHdFQi93UUVBd0lCcGpBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXCkJCUVRZdXVQdVpVRWNqcU52TnNkcTJYaDN0Q1ovakFOQmdrcWhraUc5dzBCQVFzRkFBT0NBWUVBR0w4eFppb0UKL3M0bkN3V0hLYW9MT0xobGtDMHhNYlJ3UWw5Sk00ZnNIVXJDbWhKQ0RXKzhmdmtCaWJaYzAxUWMvQjQxOTZNbApiOC9EWVJlNDU0OEZQdTdpU1hIdTUvWUJSS3hBaDMvdE5BZW14S2NwYk8xdC8wSjYyK093dkRISlU4UW42NzFRCmwwczZMQ1BVa3RBdzJCVHVIcjUySU5VZWFrOEVZc0lYeXJicXNpR0lVTGRJeWVRK0hleUVhRHcyU0VCNTVidlEKVDVwZHNSVVQzTm1idjZwakY2YWloUU55dFZVYWRzRTZhbFpYWU9Ya3dmNVE5OEFhaTZEeDJnM0JsKzBlcCs1YgplQm9ESzdYSEVXZUdqN0pnQitjeWlFUU51Zm4rc3lVZG1iL1VZZjJXMzVsVW9RcjF1aFJHeWtodTBjVGtyVUoyClp2Mmhzd0pFNGhpeXVPQjBSYXQ3alNKcThYQ0huRVNrWUsvQ1BCRlBiSGhzekRoWUFKVGRNSERGTWlENVBGL2UKVGdhZTVJSXgxOVVlekVjVU5BWVlvMHF0REJLZXMxQlJqMnV0K0Mzc2tLY3V6RFVuY2hvaFNYbWJkbENyQTZaUQpiZ3RIL0x4MDYzMWpmNmdrUEc1bHJIQVJBcWdXdXFDRmVBWkM1RFhMai84R2JxSFluN1NoVnQ2VQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+      timeoutSeconds: 600
+      extensions: &ref_0
+        - name: client.authentication.k8s.io/exec
+          extension:
+            shootRef:
+              namespace: garden-ows3
+              name: ytdzgvnl69
+            gardenClusterIdentity: sap-landscape-canary
+  - name: garden-ows3--ytdzgvnl69-internal
+    cluster:
+      server: https://api.ytdzgvnl69.ows3.internal.canary.k8s.ondemand.com
+      certificate-authority-data: >-
+        LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQ1akNDQWs2Z0F3SUJBZ0lRTndjNUFHSTFIZStJTmthY1RSYm5QVEFOQmdrcWhraUc5dzBCQVFzRkFEQU4KTVFzd0NRWURWUVFERXdKallUQWVGdzB5TkRBMU1qTXdPRFEyTURkYUZ3MHpOREExTWpNd09EUTJNRGRhTUEweApDekFKQmdOVkJBTVRBbU5oTUlJQm9qQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FZOEFNSUlCaWdLQ0FZRUE1R2tQCkF5Y0hTNStVaE9tTG9xdkRQOEZwSjZIUXFqbUo0QmV2TDdvV01XNEdNNnIzNHRjazhkR0pBMnhMUVplWkVGbWMKREhMV0xFT08xZDh5bEV6WVZvMmtROTlsbklyRkREcDFka21qblgrekkrUWRRTDVkalJBSllFSytFK1lRbTU1cAo5bVhsUFVTVTZramtqSkpVakhhK2VGakwvZjZhMU1DNEdLZEhnendDMWJZM3JIeHFqRGlOQ08vVzhpMExrbUNjCktnM0lrRStRaXk4OGdMaTRwVkVjUElZa1hGanJoUTkxWWUxWGVDTkk3L3U3dktvbWNWUjlxN3A2T2QwN3ZBWGIKS1U4UDNKUG00bVVwMExWd3J6TzYySWlQVkhkbXhYYURHMTZPTklET2tJQXFZTkRxYjdYSW5UK2pMQjRtSXJlZwo5bTIrYzE3ZU9XNkpKeXhyUjZOa1JOZEE2R0lDNlJxYnFsckEySmVFOEFvTVVTNVVwV0pzcElEa210L08yWjJaClk3cTVyeFFlckJDQVJtbklkMFk1YVVEQ3RjdFFnWHVCbXJpZFltRzQwb25QRGJ6ZzcxdFlSWUlhV0N1Z1lGY1EKdmtETWV4cXRTNGZVOXM3L3JsQURVUHVQaTV3SEJQaXpPVzU0Y1pjQlYzRXZndUpnckZyRDNVaHMrN2N0QWdNQgpBQUdqUWpCQU1BNEdBMVVkRHdFQi93UUVBd0lCcGpBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXCkJCUVRZdXVQdVpVRWNqcU52TnNkcTJYaDN0Q1ovakFOQmdrcWhraUc5dzBCQVFzRkFBT0NBWUVBR0w4eFppb0UKL3M0bkN3V0hLYW9MT0xobGtDMHhNYlJ3UWw5Sk00ZnNIVXJDbWhKQ0RXKzhmdmtCaWJaYzAxUWMvQjQxOTZNbApiOC9EWVJlNDU0OEZQdTdpU1hIdTUvWUJSS3hBaDMvdE5BZW14S2NwYk8xdC8wSjYyK093dkRISlU4UW42NzFRCmwwczZMQ1BVa3RBdzJCVHVIcjUySU5VZWFrOEVZc0lYeXJicXNpR0lVTGRJeWVRK0hleUVhRHcyU0VCNTVidlEKVDVwZHNSVVQzTm1idjZwakY2YWloUU55dFZVYWRzRTZhbFpYWU9Ya3dmNVE5OEFhaTZEeDJnM0JsKzBlcCs1YgplQm9ESzdYSEVXZUdqN0pnQitjeWlFUU51Zm4rc3lVZG1iL1VZZjJXMzVsVW9RcjF1aFJHeWtodTBjVGtyVUoyClp2Mmhzd0pFNGhpeXVPQjBSYXQ3alNKcThYQ0huRVNrWUsvQ1BCRlBiSGhzekRoWUFKVGRNSERGTWlENVBGL2UKVGdhZTVJSXgxOVVlekVjVU5BWVlvMHF0REJLZXMxQlJqMnV0K0Mzc2tLY3V6RFVuY2hvaFNYbWJkbENyQTZaUQpiZ3RIL0x4MDYzMWpmNmdrUEc1bHJIQVJBcWdXdXFDRmVBWkM1RFhMai84R2JxSFluN1NoVnQ2VQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+      extensions: *ref_0
+users:
+  - name: garden-ows3--ytdzgvnl69
+    user:
+      exec:
+        apiVersion: client.authentication.k8s.io/v1beta1
+        command: kubectl-gardenlogin
+        args:
+          - get-client-certificate
+        provideClusterInfo: true
+        interactiveMode: IfAvailable
+        installHint: >-
+          Follow the instructions on
+
+          - https://github.com/gardener/gardenlogin#installation to install and
+
+          - https://github.com/gardener/gardenlogin#configure-gardenlogin to
+          configure the gardenlogin credential plugin.
+
+
+          The following is a sample configuration for gardenlogin as well as
+          gardenctl. Place the file under ~/.garden/gardenctl-v2.yaml.
+
+
+          ---
+
+          gardens:
+            - identity: sap-landscape-canary
+              kubeconfig: "<path-to-garden-cluster-kubeconfig>"
+          ...
+
+
+          Alternatively, you can run the following gardenctl command:
+
+
+          $ gardenctl config set-garden sap-landscape-canary --kubeconfig
+          "<path-to-garden-cluster-kubeconfig>"
+
+
+          Note that the kubeconfig refers to the path of the garden cluster
+          kubeconfig which you can download from the Account page.

.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Go: Launch Package",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/cmds",
+            "env": {
+                "VERBOSE": "2",
+                "PORT": "8080"
+            }
+        }
+    ]
+}

Makefile

@@ -8,49 +8,69 @@ DBHOST     ?= 127.0.0.1
 DBPORT     ?= 3306
 DBUSER     ?= root
 DBPASSWORD ?= password
-IMAGE      ?= duglin/xreg-server
+IMAGE      ?= xreg-server
+VERSION_FILE := version.txt
+NAMESPACE := ingress-nginx
+EMAIL := albin.ramovic@sap.com
 
+# Get folders containing tests
 TESTDIRS := $(shell find . -name *_test.go -exec dirname {} \; | sort -u)
 
+# Read the current version from the file
+CURRENT_VERSION := $(shell cat $(VERSION_FILE))
+
+# Increment the (minor) version number
+define increment_version
+	$(eval MAJOR := $(word 1,$(subst ., ,$(CURRENT_VERSION))))
+	$(eval MINOR := $(word 2,$(subst ., ,$(CURRENT_VERSION))))
+	$(eval PATCH := $(word 3,$(subst ., ,$(CURRENT_VERSION))))
+	$(eval NEW_MINOR := $(shell echo $$(($(MINOR) + 1))))
+	$(eval NEW_VERSION := $(MAJOR).$(NEW_MINOR).$(PATCH))
+endef
+
 ifdef XR_SPEC
   # If pointing to local spec then make sure "docker run" uses it too
   DOCKER_SPEC=/spec
 endif
 
 cmds: .cmds
-.cmds: server xr
+.cmds: server
 	@touch .cmds
 
 qtest: .test
 
-test: .test .testimage
+tmptest: 
+	@echo "# Testing: tmp change"
+	@go clean -testcache
+	@echo "go test -failfast ./registry"
+	@go test -failfast ./registry
+
+test: .test
 .test: export TESTING=1
 .test: .cmds */*test.go
-	@make --no-print-directory mysql waitformysql
-	@echo
 	@echo "# Testing"
 	@go clean -testcache
 	@echo "go test -failfast $(TESTDIRS)"
 	@for s in $(TESTDIRS); do if ! go test -failfast $$s; then exit 1; fi; done
-	@# go test -failfast $(TESTDIRS)
+	@go test -failfast $(TESTDIRS)
 	@echo
 	@echo "# Run again w/o deleting the Registry after each one"
 	@go clean -testcache
 	NO_DELETE_REGISTRY=1 go test -failfast $(TESTDIRS)
 	@touch .test
 
-unittest:
+.unittest:
 	go test -failfast ./registry
 
 server: cmds/server.go cmds/loader.go registry/*
 	@echo
 	@echo "# Building server"
 	go build $(BUILDFLAGS) -o $@ cmds/server.go cmds/loader.go
 
-xr: cmds/xr*.go registry/*
+xr: cmds/xr/xr*.go registry/*
 	@echo
 	@echo "# Building CLI"
-	go build $(BUILDFLAGS) -o $@ cmds/xr*.go
+	go build $(BUILDFLAGS) -o $@ cmds/xr/xr*.go
 
 image: .image
 .image: server misc/Dockerfile misc/waitformysql misc/Dockerfile-all \
@@ -63,9 +83,10 @@ ifdef XR_SPEC
 	@mkdir -p .spec
 	cp -r $(XR_SPEC)/* .spec
 endif
-	@misc/errOutput docker build -f misc/Dockerfile -t $(IMAGE) --no-cache .
+	@misc/errOutput docker build --progress=plain -f misc/Dockerfile -t $(IMAGE) --no-cache .
 	@misc/errOutput docker build -f misc/Dockerfile-all -t $(IMAGE)-all \
 		--no-cache .
+	@echo "# Image $(IMAGE) successfully created"
 ifdef XR_SPEC
 	@rm -rf .spec
 endif
@@ -85,8 +106,23 @@ testimage: .testimage
 
 push: .push
 .push: .image
-	docker push $(IMAGE)
-	docker push $(IMAGE)-all
+	@echo "# Build and push Docker image"
+	@docker login --username=$(ARTIFACTORY_USER) --password=$(ARTIFACTORY_TOKEN) $(JF_URL)
+	@echo "Incrementing the version..."
+	@$(call increment_version)
+	@if [ -z "$(NEW_VERSION)" ]; then \
+		NEW_VERSION=latest; \
+	fi
+
+	@echo "Delete the latest tag because overwrite is not working in Artifactory"
+	@curl -X DELETE -u "$(ARTIFACTORY_USER):$(ARTIFACTORY_TOKEN)" "https://$(JF_URL)/v2/$(IMAGE)/manifests/latest"
+	@echo "Push the latest docker image"
+	@docker tag $(IMAGE) $(JF_URL)/$(IMAGE):latest 
+	@docker push $(JF_URL)/$(IMAGE):latest
+	@echo "Push the $(NEW_VERSION) docker image"
+	@docker tag $(IMAGE) $(JF_URL)/$(IMAGE):$(NEW_VERSION)
+	@docker push $(JF_URL)/$(IMAGE):$(NEW_VERSION)
+	@echo $(NEW_VERSION) > $(VERSION_FILE)
 	@touch .push
 
 notest run: mysql server local
@@ -138,6 +174,24 @@ mysql-client: mysql waitformysql
 		--protocol tcp || \
 		echo "If it failed, make sure mysql is ready"
 
+k8: $(GARDEN_OWS3_PATH) $(K8_CLUSTER_PATH)
+	@$(MAKE) push
+	@gardenctl config set-garden sap-landscape-canary --kubeconfig "$(GARDEN_OWS3_PATH)"
+	# TODO: Solve this blocker "Please visit the following URL in your browser manually: http://localhost:8000"
+	# @kubectl --kubeconfig "$(K8_CLUSTER_PATH)" get namespaces
+	@export KUBECONFIG=$(K8_CLUSTER_PATH)
+	# @kubectl create secret docker-registry apeirora-ows3-secret \
+	# 	--docker-username=$(ARTIFACTORY_USER) \
+	# 	--docker-password=$(ARTIFACTORY_TOKEN) \
+	# 	--docker-email=$(EMAIL) \
+	# 	--docker-server=$(JF_URL) \
+	# 	--namespace=$(NAMESPACE)
+
+k8-apply: 
+	@echo "Delete $(IMAGE) service from the $(NAMESPACE) namespace first..."
+	@kubectl delete -f misc/deploy.yaml
+	@kubectl apply -f misc/deploy.yaml
+
 k3d: misc/mysql.yaml
 	@k3d cluster list | grep xreg > /dev/null || \
 		(creating k3d cluster || \