Skip to content

Commit

Permalink
Remove module template and LM testing leftovers (#524)
Browse files Browse the repository at this point in the history
  • Loading branch information
barchw authored Dec 20, 2023
1 parent 87c9989 commit 0b3d100
Show file tree
Hide file tree
Showing 10 changed files with 1 addition and 326 deletions.
3 changes: 0 additions & 3 deletions .env

This file was deleted.

13 changes: 1 addition & 12 deletions .github/workflows/create-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,12 @@ jobs:
- uses: autotelic/action-wait-for-status-check@6556cf50c8fb6608412945382eae73581f56cbb4
name: Build image
id: wait-for-build
with:
token: ${{ secrets.GITHUB_TOKEN }}
statusName: "rel-istio-module-build"
timeoutSeconds: "1800"
- name: Check that build status is success
if: steps.wait-for-build.outputs.state != 'success'
run: exit 1

- uses: autotelic/action-wait-for-status-check@6556cf50c8fb6608412945382eae73581f56cbb4
name: Build module
id: wait-for-module
with:
token: ${{ secrets.GITHUB_TOKEN }}
statusName: "rel-istio-build"
timeoutSeconds: "1800"
- name: Check that module build status is success
if: steps.wait-for-module.outputs.state != 'success'
if: steps.wait-for-build.outputs.state != 'success'
run: exit 1

- name: Publish release assets
Expand Down
45 changes: 0 additions & 45 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
include .env

# Module Name used for bundling the OCI Image and later on for referencing in the Kyma Modules
MODULE_NAME ?= istio

# Module Registry used for pushing the image
MODULE_REGISTRY_PORT ?= 8888
MODULE_REGISTRY ?= op-kcp-registry.localhost:$(MODULE_REGISTRY_PORT)/unsigned
# Desired Channel of the Generated Module Template
MODULE_TEMPLATE_CHANNEL ?= stable
MODULE_CHANNEL ?= fast

# Operating system architecture
OS_ARCH ?= $(shell uname -m)
Expand Down Expand Up @@ -44,17 +38,6 @@ COMPONENT_CLI_VERSION ?= latest
# It is required for upgrade integration test
TARGET_BRANCH ?= ""

# This will change the flags of the `kyma alpha module create` command in case we spot credentials
# Otherwise we will assume http-based local registries without authentication (e.g. for k3d)
ifneq (,$(PROW_JOB_ID))
GCP_ACCESS_TOKEN=$(shell gcloud auth application-default print-access-token)
MODULE_CREATION_FLAGS=--registry $(MODULE_REGISTRY) --module-archive-version-overwrite -c oauth2accesstoken:$(GCP_ACCESS_TOKEN)
else ifeq (,$(MODULE_CREDENTIALS))
MODULE_CREATION_FLAGS=--registry $(MODULE_REGISTRY) --module-archive-version-overwrite --insecure
else
MODULE_CREATION_FLAGS=--registry $(MODULE_REGISTRY) --module-archive-version-overwrite -c $(MODULE_CREDENTIALS)
endif

##@ General

# The help target prints out all targets with their descriptions organized
Expand Down Expand Up @@ -201,44 +184,16 @@ $(ENVTEST): $(LOCALBIN)
module-image: docker-build docker-push ## Build the Module Image and push it to a registry defined in IMG_REGISTRY
echo "built and pushed module image $(IMG)"

.PHONY: module-build
module-build: kyma kustomize ## Build the Module and push it to a registry defined in MODULE_REGISTRY
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
@$(KYMA) alpha create module --kubebuilder-project --channel=${MODULE_CHANNEL} --name kyma-project.io/module/$(MODULE_NAME) --version $(MODULE_VERSION) --path . --output "template-${MODULE_CHANNEL}.yaml" $(MODULE_CREATION_FLAGS)

.PHONY: generate-manifests
generate-manifests: kustomize
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
$(KUSTOMIZE) build config/default > istio-manager.yaml

##@ Tools

########## Kyma CLI ###########
KYMA_STABILITY ?= unstable

# $(call os_error, os-type, os-architecture)
define os_error
$(error Error: unsuported platform OS_TYPE:$1, OS_ARCH:$2; to mitigate this problem set variable KYMA with absolute path to kyma-cli binary compatible with your operating system and architecture)
endef

KYMA_FILE_NAME ?= $(shell ./hack/get_kyma_file_name.sh ${OS_TYPE} ${OS_ARCH})

KYMA ?= $(LOCALBIN)/kyma-$(KYMA_STABILITY)
kyma: $(LOCALBIN) $(KYMA) ## Download kyma locally if necessary.
$(KYMA):
## Detect if operating system
$(if $(KYMA_FILE_NAME),,$(call os_error, ${OS_TYPE}, ${OS_ARCH}))
test -f $@ || curl -s -Lo $(KYMA) https://storage.googleapis.com/kyma-cli-$(KYMA_STABILITY)/$(KYMA_FILE_NAME)
chmod 0100 $(KYMA)

########## Grafana Dashboard ###########
.PHONY: grafana-dashboard
grafana-dashboard: ## Generating Grafana manifests to visualize controller status.
cd operator && kubebuilder edit --plugins grafana.kubebuilder.io/v1-alpha

.PHONY: all
all: module-build

########## Performance Tests ###########
.PHONY: gardener-perf-test
gardener-perf-test:
Expand Down
43 changes: 0 additions & 43 deletions hack/ci/Makefile

This file was deleted.

22 changes: 0 additions & 22 deletions hack/local/Makefile

This file was deleted.

5 changes: 0 additions & 5 deletions hack/local/busola/Makefile

This file was deleted.

13 changes: 0 additions & 13 deletions hack/local/busola/k3d-patches/busola-extensibility.yaml

This file was deleted.

72 changes: 0 additions & 72 deletions hack/local/busola/k3d-patches/busola-kyma-extension.yaml

This file was deleted.

104 changes: 0 additions & 104 deletions hack/local/istio/Makefile

This file was deleted.

This file was deleted.

0 comments on commit 0b3d100

Please sign in to comment.