diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d960500..531bef9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,8 +1,12 @@ name: Lint on: - push: + workflow_dispatch: pull_request: + merge_group: + push: + branches: + - main jobs: lint: @@ -10,14 +14,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone the code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version-file: go.mod - name: Run linter - uses: golangci/golangci-lint-action@v8 - with: - version: v2.3.0 + run: make lint diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..a6efc09 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,63 @@ +name: Release + +on: + workflow_dispatch: + push: + branches: + - 'main' + tags: + - 'v*' + pull_request: + branches: + - main + merge_group: + +jobs: + goreleaser: + name: Release + runs-on: ubuntu-latest + steps: + - name: Check out code into the Go module directory + uses: actions/checkout@v5 + with: + fetch-depth: 0 + + - name: Install Go + uses: actions/setup-go@v6 + with: + go-version-file: "go.mod" + + - name: Docker Login + uses: docker/login-action@v3 + if: ${{ github.event_name != 'pull_request' }} + with: + registry: quay.io + username: ${{ secrets.QUAY_USERNAME }} + password: ${{ secrets.QUAY_PASSWORD }} + + - name: Set the release related variables + run: | + if [[ $GITHUB_REF == refs/tags/* ]]; then + # Release tags. + echo VERSION="$(echo "${GITHUB_REF#refs/tags/}" | sed 's/^v//')" >> $GITHUB_ENV + echo RELEASE=true >> $GITHUB_ENV + elif [[ $GITHUB_REF == refs/heads/main ]]; then + # 'main' branch build. + echo TAG=snapshot >> $GITHUB_ENV + echo RELEASE=true >> $GITHUB_ENV + fi + + - name: Release + run: make release + + - name: Create Release + id: create_release + uses: actions/create-release@v1 + if: ${{ github.event_name != 'pull_request' }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + draft: false + prerelease: false diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 68fd1ed..2c2fcd1 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone the code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version-file: go.mod diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fc2e80d..a2f0c57 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,8 +1,12 @@ name: Tests on: - push: + workflow_dispatch: pull_request: + merge_group: + push: + branches: + - main jobs: test: @@ -10,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone the code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: go-version-file: go.mod diff --git a/.gitignore b/.gitignore index ada68ff..62df8bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Generated catalog +catalog/catalog.json + # Binaries for programs and plugins *.exe *.exe~ diff --git a/Makefile b/Makefile index ccf7517..cd35cdc 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 0.0.5 +VERSION ?= 0.0.0 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") @@ -24,6 +24,11 @@ BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL) endif BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) +RELEASE ?= false +ifeq ($(RELEASE), true) + DOCKER_BUILDX_FLAGS += --push +endif + # IMAGE_TAG_BASE defines the docker.io namespace and part of the image name for remote images. # This variable is used to construct full image tags for bundle and catalog images. # @@ -31,12 +36,14 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) # quay.io/olmtest/webhook-operator:$VERSION and quay.io/olmtest/webhook-operator-bundle:$VERSION. IMAGE_TAG_BASE ?= quay.io/olmtest/webhook-operator +TAG ?= v$(VERSION) + # BUNDLE_IMG defines the image:tag used for the bundle. # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=/:) -BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION) +BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:$(TAG) # The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v0.2.0). -CATALOG_IMG ?= $(IMAGE_TAG_BASE)-index:v$(VERSION) +CATALOG_IMG ?= $(IMAGE_TAG_BASE)-index:$(TAG) # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) @@ -54,7 +61,7 @@ endif OPERATOR_SDK_VERSION ?= v1.41.1 # Image URL to use all building/pushing image targets -IMG ?= quay.io/olmtest/webhook-operator:v$(VERSION) +IMG ?= quay.io/olmtest/webhook-operator:$(TAG) # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) @@ -116,6 +123,14 @@ vet: ## Run go vet against code. test: manifests generate fmt vet setup-envtest ## Run tests. KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e) -coverprofile cover.out +.PHONY: tidy +tidy: + go mod tidy + +.PHONY: verify +verify: tidy fmt manifests generate + git diff --exit-code + # TODO(user): To use a different vendor for e2e tests, modify the setup under 'tests/e2e'. # The default setup assumes Kind is pre-installed and builds/loads the Manager Docker image locally. # CertManager is installed by default; skip with: @@ -191,24 +206,10 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - $(CONTAINER_TOOL) buildx create --name webhook-operator-builder $(CONTAINER_TOOL) buildx use webhook-operator-builder - - $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . + - $(CONTAINER_TOOL) buildx build $(DOCKER_BUILDX_FLAGS) --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - $(CONTAINER_TOOL) buildx rm webhook-operator-builder rm Dockerfile.cross -.PHONY: bundle-docker-buildx -bundle-docker-buildx: ## Build and push bundle image with cross-platform support - - $(CONTAINER_TOOL) buildx create --name webhook-operator-bundle-builder - $(CONTAINER_TOOL) buildx use webhook-operator-bundle-builder - - $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${BUNDLE_IMG} -f bundle.Dockerfile . - - $(CONTAINER_TOOL) buildx rm webhook-operator-bundle-builder - -.PHONY: index-docker-buildx -index-docker-buildx: ## Build and push docker image for the manager for cross-platform support - - $(CONTAINER_TOOL) buildx create --name webhook-operator-index-builder - $(CONTAINER_TOOL) buildx use webhook-operator-index-builder - - $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${CATALOG_IMG} -f catalog.Dockerfile . - - $(CONTAINER_TOOL) buildx rm webhook-operator-index-builder - .PHONY: build-installer build-installer: manifests generate kustomize ## Generate a consolidated YAML with CRDs and deployment. mkdir -p dist @@ -337,3 +338,44 @@ bundle-build: ## Build the bundle image. .PHONY: bundle-push bundle-push: ## Push the bundle image. $(MAKE) docker-push IMG=$(BUNDLE_IMG) + +.PHONY: bundle-docker-buildx +bundle-docker-buildx: bundle ## Build and push bundle image with cross-platform support + - $(CONTAINER_TOOL) buildx create --name webhook-operator-bundle-builder + $(CONTAINER_TOOL) buildx use webhook-operator-bundle-builder + - $(CONTAINER_TOOL) buildx build $(DOCKER_BUILDX_FLAGS) --platform=$(PLATFORMS) --tag ${BUNDLE_IMG} -f bundle.Dockerfile . + - $(CONTAINER_TOOL) buildx rm webhook-operator-bundle-builder + +.PHONY: opm +OPM = $(LOCALBIN)/opm +opm: ## Download opm locally if necessary. +ifeq (,$(wildcard $(OPM))) +ifeq (,$(shell which opm 2>/dev/null)) + @{ \ + set -e ;\ + mkdir -p $(dir $(OPM)) ;\ + OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/latest/download/$${OS}-$${ARCH}-opm ;\ + chmod +x $(OPM) ;\ + } +else +OPM = $(shell which opm) +endif +endif + +.PHONY: build-catalog +build-catalog: opm + @# Create base catalog from template + sed "s/{{ VERSION }}/$(VERSION)/g" catalog/catalog.tpl > catalog/catalog.json + @# Add bundle FBC + $(OPM) render ./bundle + +.PHONY: catalog-docker-buildx +catalog-docker-buildx: build-catalog ## Build and push docker image for the manager for cross-platform support + - $(CONTAINER_TOOL) buildx create --name webhook-operator-index-builder + $(CONTAINER_TOOL) buildx use webhook-operator-index-builder + - $(CONTAINER_TOOL) buildx build $(DOCKER_BUILDX_FLAGS) --platform=$(PLATFORMS) --tag ${CATALOG_IMG} -f catalog.Dockerfile . + - $(CONTAINER_TOOL) buildx rm webhook-operator-index-builder + +.PHONY: release +release: docker-buildx bundle-docker-buildx catalog-docker-buildx diff --git a/bundle/manifests/webhook-operator.clusterserviceversion.yaml b/bundle/manifests/webhook-operator.clusterserviceversion.yaml index 29a1238..a61147d 100644 --- a/bundle/manifests/webhook-operator.clusterserviceversion.yaml +++ b/bundle/manifests/webhook-operator.clusterserviceversion.yaml @@ -30,10 +30,10 @@ metadata: } ] capabilities: Basic Install - createdAt: "2025-09-29T13:06:16Z" + createdAt: "2025-09-30T13:14:21Z" operators.operatorframework.io/builder: operator-sdk-v1.41.1 operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 - name: webhook-operator.v0.0.5 + name: webhook-operator.v0.0.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -126,7 +126,7 @@ spec: - --webhook-cert-path=/tmp/k8s-webhook-server/serving-certs command: - /manager - image: quay.io/olmtest/webhook-operator:v0.0.5 + image: quay.io/olmtest/webhook-operator:v0.0.0 livenessProbe: httpGet: path: /healthz @@ -228,7 +228,7 @@ spec: maturity: alpha provider: name: operator-framework - version: 0.0.5 + version: 0.0.0 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/catalog.Dockerfile b/catalog.Dockerfile index 0e24d7d..e932935 100644 --- a/catalog.Dockerfile +++ b/catalog.Dockerfile @@ -1,9 +1,10 @@ # The builder image is expected to contain # /bin/opm (with serve subcommand) -FROM quay.io/operator-framework/opm:latest as builder +FROM quay.io/operator-framework/opm:latest AS builder # Copy FBC root into image at /configs and pre-populate serve cache -ADD catalog /configs +ADD catalog/.indexignore /configs/.indexignore +ADD catalog/catalog.json /configs/catalog.json RUN ["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"] FROM quay.io/operator-framework/opm:latest diff --git a/catalog/.indexignore b/catalog/.indexignore new file mode 100644 index 0000000..dc38940 --- /dev/null +++ b/catalog/.indexignore @@ -0,0 +1,3 @@ +/expected_all.json +/catalog.tpl +..* diff --git a/catalog/catalog.json b/catalog/catalog.json deleted file mode 100644 index 333a70a..0000000 --- a/catalog/catalog.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "schema": "olm.package", - "name": "webhook-operator", - "defaultChannel": "alpha" -} -{ - "schema": "olm.channel", - "name": "alpha", - "package": "webhook-operator", - "entries": [ - { - "name": "webhook-operator.v0.0.5" - } - ] -} -{ - "schema": "olm.bundle", - "name": "webhook-operator.v0.0.5", - "package": "webhook-operator", - "image": "quay.io/olmtest/webhook-operator-bundle:v0.0.5", - "properties": [ - { - "type": "olm.gvk", - "value": { - "group": "webhook.operators.coreos.io", - "kind": "WebhookTest", - "version": "v1" - } - }, - { - "type": "olm.gvk", - "value": { - "group": "webhook.operators.coreos.io", - "kind": "WebhookTest", - "version": "v2" - } - }, - { - "type": "olm.package", - "value": { - "packageName": "webhook-operator", - "version": "0.0.5" - } - }, - { - "type": "olm.bundle.object", - "value": { - "data": "{"apiVersion":"apiextensions.k8s.io/v1","kind":"CustomResourceDefinition","metadata":{"annotations":{"cert-manager.io/inject-ca-from":"webhook-operator-system/webhook-operator-serving-cert","controller-gen.kubebuilder.io/version":"v0.18.0"},"creationTimestamp":null,"name":"webhooktests.webhook.operators.coreos.io"},"spec":{"conversion":{"strategy":"Webhook","webhook":{"clientConfig":{"service":{"name":"webhook-operator-webhook-service","namespace":"webhook-operator-system","path":"/convert"}},"conversionReviewVersions":["v1"]}},"group":"webhook.operators.coreos.io","names":{"kind":"WebhookTest","listKind":"WebhookTestList","plural":"webhooktests","singular":"webhooktest"},"scope":"Namespaced","versions":[{"name":"v1","schema":{"openAPIV3Schema":{"description":"WebhookTest is the Schema for the webhooktests API","properties":{"apiVersion":{"description":"APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources","type":"string"},"kind":{"description":"Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds","type":"string"},"metadata":{"type":"object"},"spec":{"description":"spec defines the desired state of WebhookTest","properties":{"mutate":{"description":"Mutate is a field that will be set to true by the mutating webhook.","type":"boolean"},"valid":{"description":"Valid must be set to true or the validation webhook will reject the resource.","type":"boolean"}},"required":["valid"],"type":"object"},"status":{"description":"status defines the observed state of WebhookTest","properties":{"conditions":{"description":"conditions represent the current state of the WebhookTest resource.\nEach condition has a unique type and reflects the status of a specific aspect of the resource.\n\nStandard condition types include:\n- \"Available\": the resource is fully functional\n- \"Progressing\": the resource is being created or updated\n- \"Degraded\": the resource failed to reach or maintain its desired state\n\nThe status of each condition is one of True, False, or Unknown.","items":{"description":"Condition contains details for one aspect of the current state of this API Resource.","properties":{"lastTransitionTime":{"description":"lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.","format":"date-time","type":"string"},"message":{"description":"message is a human readable message indicating details about the transition.\nThis may be an empty string.","maxLength":32768,"type":"string"},"observedGeneration":{"description":"observedGeneration represents the .metadata.generation that the condition was set based upon.\nFor instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date\nwith respect to the current state of the instance.","format":"int64","minimum":0,"type":"integer"},"reason":{"description":"reason contains a programmatic identifier indicating the reason for the condition's last transition.\nProducers of specific condition types may define expected values and meanings for this field,\nand whether the values are considered a guaranteed API.\nThe value should be a CamelCase string.\nThis field may not be empty.","maxLength":1024,"minLength":1,"pattern":"^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$","type":"string"},"status":{"description":"status of the condition, one of True, False, Unknown.","enum":["True","False","Unknown"],"type":"string"},"type":{"description":"type of condition in CamelCase or in foo.example.com/CamelCase.","maxLength":316,"pattern":"^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$","type":"string"}},"required":["lastTransitionTime","message","reason","status","type"],"type":"object"},"type":"array","x-kubernetes-list-map-keys":["type"],"x-kubernetes-list-type":"map"}},"type":"object"}},"required":["spec"],"type":"object"}},"served":true,"storage":true,"subresources":{"status":{}}},{"name":"v2","schema":{"openAPIV3Schema":{"description":"WebhookTest is the Schema for the webhooktests API","properties":{"apiVersion":{"description":"APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources","type":"string"},"kind":{"description":"Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds","type":"string"},"metadata":{"type":"object"},"spec":{"description":"spec defines the desired state of WebhookTest","properties":{"conversion":{"description":"Conversion is an example field of WebhookTest. Edit WebhookTest_types.go to remove/update","properties":{"mutate":{"description":"Mutate is a field that will be set to true by the mutating webhook.","type":"boolean"},"valid":{"description":"Valid must be set to true or the validation webhook will reject the resource.","type":"boolean"}},"required":["valid"],"type":"object"}},"required":["conversion"],"type":"object"},"status":{"description":"status defines the observed state of WebhookTest","properties":{"conditions":{"description":"conditions represent the current state of the WebhookTest resource.\nEach condition has a unique type and reflects the status of a specific aspect of the resource.\n\nStandard condition types include:\n- \"Available\": the resource is fully functional\n- \"Progressing\": the resource is being created or updated\n- \"Degraded\": the resource failed to reach or maintain its desired state\n\nThe status of each condition is one of True, False, or Unknown.","items":{"description":"Condition contains details for one aspect of the current state of this API Resource.","properties":{"lastTransitionTime":{"description":"lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.","format":"date-time","type":"string"},"message":{"description":"message is a human readable message indicating details about the transition.\nThis may be an empty string.","maxLength":32768,"type":"string"},"observedGeneration":{"description":"observedGeneration represents the .metadata.generation that the condition was set based upon.\nFor instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date\nwith respect to the current state of the instance.","format":"int64","minimum":0,"type":"integer"},"reason":{"description":"reason contains a programmatic identifier indicating the reason for the condition's last transition.\nProducers of specific condition types may define expected values and meanings for this field,\nand whether the values are considered a guaranteed API.\nThe value should be a CamelCase string.\nThis field may not be empty.","maxLength":1024,"minLength":1,"pattern":"^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$","type":"string"},"status":{"description":"status of the condition, one of True, False, Unknown.","enum":["True","False","Unknown"],"type":"string"},"type":{"description":"type of condition in CamelCase or in foo.example.com/CamelCase.","maxLength":316,"pattern":"^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$","type":"string"}},"required":["lastTransitionTime","message","reason","status","type"],"type":"object"},"type":"array","x-kubernetes-list-map-keys":["type"],"x-kubernetes-list-type":"map"}},"type":"object"}},"required":["spec"],"type":"object"}},"served":true,"storage":false,"subresources":{"status":{}}}]},"status":{"acceptedNames":{"kind":"","plural":""},"conditions":null,"storedVersions":null}}" - } - }, - { - "type": "olm.bundle.object", - "value": { - "data": "{"apiVersion":"operators.coreos.com/v1alpha1","kind":"ClusterServiceVersion","metadata":{"annotations":{"alm-examples":"[\n  {\n    \"apiVersion\": \"webhook.operators.coreos.io/v1\",\n    \"kind\": \"WebhookTest\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"webhook-operator\"\n      },\n      \"name\": \"webhooktest-sample\"\n    },\n    \"spec\": null\n  },\n  {\n    \"apiVersion\": \"webhook.operators.coreos.io/v2\",\n    \"kind\": \"WebhookTest\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"webhook-operator\"\n      },\n      \"name\": \"webhooktest-sample\"\n    },\n    \"spec\": null\n  }\n]","capabilities":"Basic Install","createdAt":"2025-09-29T13:06:16Z","operators.operatorframework.io/builder":"operator-sdk-v1.41.1","operators.operatorframework.io/project_layout":"go.kubebuilder.io/v4"},"name":"webhook-operator.v0.0.5","namespace":"placeholder"},"spec":{"apiservicedefinitions":{},"customresourcedefinitions":{"owned":[{"description":"WebhookTest is the Schema for the webhooktests API","displayName":"Webhook Test","kind":"WebhookTest","name":"webhooktests.webhook.operators.coreos.io","version":"v1"},{"description":"WebhookTest is the Schema for the webhooktests API","displayName":"Webhook Test","kind":"WebhookTest","name":"webhooktests.webhook.operators.coreos.io","version":"v2"}]},"description":"webhook-operator test fixture","displayName":"webhook-operator","icon":[{"base64data":"","mediatype":""}],"install":{"spec":{"clusterPermissions":[{"rules":[{"apiGroups":["webhook.operators.coreos.io"],"resources":["webhooktests"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["webhook.operators.coreos.io"],"resources":["webhooktests/finalizers"],"verbs":["update"]},{"apiGroups":["webhook.operators.coreos.io"],"resources":["webhooktests/status"],"verbs":["get","patch","update"]},{"apiGroups":["authentication.k8s.io"],"resources":["tokenreviews"],"verbs":["create"]},{"apiGroups":["authorization.k8s.io"],"resources":["subjectaccessreviews"],"verbs":["create"]}],"serviceAccountName":"webhook-operator-controller-manager"}],"deployments":[{"label":{"app.kubernetes.io/managed-by":"kustomize","app.kubernetes.io/name":"webhook-operator","control-plane":"controller-manager"},"name":"webhook-operator-controller-manager","spec":{"replicas":1,"selector":{"matchLabels":{"app.kubernetes.io/name":"webhook-operator","control-plane":"controller-manager"}},"strategy":{},"template":{"metadata":{"annotations":{"kubectl.kubernetes.io/default-container":"manager"},"labels":{"app.kubernetes.io/name":"webhook-operator","control-plane":"controller-manager"}},"spec":{"containers":[{"args":["--metrics-bind-address=:8443","--leader-elect","--health-probe-bind-address=:8081","--webhook-cert-path=/tmp/k8s-webhook-server/serving-certs"],"command":["/manager"],"image":"quay.io/olmtest/webhook-operator:v0.0.5","livenessProbe":{"httpGet":{"path":"/healthz","port":8081},"initialDelaySeconds":15,"periodSeconds":20},"name":"manager","ports":[{"containerPort":9443,"name":"webhook-server","protocol":"TCP"}],"readinessProbe":{"httpGet":{"path":"/readyz","port":8081},"initialDelaySeconds":5,"periodSeconds":10},"resources":{"limits":{"cpu":"500m","memory":"128Mi"},"requests":{"cpu":"10m","memory":"64Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true},"volumeMounts":[{"mountPath":"/tmp/k8s-webhook-server/serving-certs","name":"webhook-certs","readOnly":true}]}],"securityContext":{"runAsNonRoot":true,"seccompProfile":{"type":"RuntimeDefault"}},"serviceAccountName":"webhook-operator-controller-manager","terminationGracePeriodSeconds":10,"volumes":[{"name":"webhook-certs","secret":{"secretName":"webhook-server-cert"}}]}}}}],"permissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":["coordination.k8s.io"],"resources":["leases"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]}],"serviceAccountName":"webhook-operator-controller-manager"}]},"strategy":"deployment"},"installModes":[{"supported":false,"type":"OwnNamespace"},{"supported":false,"type":"SingleNamespace"},{"supported":false,"type":"MultiNamespace"},{"supported":true,"type":"AllNamespaces"}],"keywords":["test","operator","webhooks"],"links":[{"name":"Webhook Operator","url":"https://webhook-operator.domain"}],"maintainers":[{"email":"no-reply@operator-framework.io","name":"no-reply"}],"maturity":"alpha","provider":{"name":"operator-framework"},"version":"0.0.5","webhookdefinitions":[{"admissionReviewVersions":["v1"],"containerPort":443,"conversionCRDs":["webhooktests.webhook.operators.coreos.io"],"deploymentName":"webhook-operator-controller-manager","generateName":"cwebhooktests.kb.io","sideEffects":"None","targetPort":9443,"type":"ConversionWebhook","webhookPath":"/convert"},{"admissionReviewVersions":["v1"],"containerPort":443,"deploymentName":"webhook-operator-controller-manager","failurePolicy":"Fail","generateName":"mwebhooktest-v1.kb.io","rules":[{"apiGroups":["webhook.operators.coreos.io"],"apiVersions":["v1"],"operations":["CREATE","UPDATE"],"resources":["webhooktests"]}],"sideEffects":"None","targetPort":9443,"type":"MutatingAdmissionWebhook","webhookPath":"/mutate-webhook-operators-coreos-io-v1-webhooktest"},{"admissionReviewVersions":["v1"],"containerPort":443,"deploymentName":"webhook-operator-controller-manager","failurePolicy":"Fail","generateName":"vwebhooktest-v1.kb.io","rules":[{"apiGroups":["webhook.operators.coreos.io"],"apiVersions":["v1"],"operations":["CREATE","UPDATE"],"resources":["webhooktests"]}],"sideEffects":"None","targetPort":9443,"type":"ValidatingAdmissionWebhook","webhookPath":"/validate-webhook-operators-coreos-io-v1-webhooktest"}]}}" - } - }, - { - "type": "olm.bundle.object", - "value": { - "data": "eyJhcGlWZXJzaW9uIjoicmJhYy5hdXRob3JpemF0aW9uLms4cy5pby92MSIsImtpbmQiOiJDbHVzdGVyUm9sZSIsIm1ldGFkYXRhIjp7ImNyZWF0aW9uVGltZXN0YW1wIjpudWxsLCJsYWJlbHMiOnsiYXBwLmt1YmVybmV0ZXMuaW8vbWFuYWdlZC1ieSI6Imt1c3RvbWl6ZSIsImFwcC5rdWJlcm5ldGVzLmlvL25hbWUiOiJ3ZWJob29rLW9wZXJhdG9yIn0sIm5hbWUiOiJ3ZWJob29rLW9wZXJhdG9yLXdlYmhvb2t0ZXN0LWFkbWluLXJvbGUifSwicnVsZXMiOlt7ImFwaUdyb3VwcyI6WyJ3ZWJob29rLm9wZXJhdG9ycy5jb3Jlb3MuaW8iXSwicmVzb3VyY2VzIjpbIndlYmhvb2t0ZXN0cyJdLCJ2ZXJicyI6WyIqIl19LHsiYXBpR3JvdXBzIjpbIndlYmhvb2sub3BlcmF0b3JzLmNvcmVvcy5pbyJdLCJyZXNvdXJjZXMiOlsid2ViaG9va3Rlc3RzL3N0YXR1cyJdLCJ2ZXJicyI6WyJnZXQiXX1dfQ==" - } - }, - { - "type": "olm.bundle.object", - "value": { - "data": "eyJhcGlWZXJzaW9uIjoicmJhYy5hdXRob3JpemF0aW9uLms4cy5pby92MSIsImtpbmQiOiJDbHVzdGVyUm9sZSIsIm1ldGFkYXRhIjp7ImNyZWF0aW9uVGltZXN0YW1wIjpudWxsLCJsYWJlbHMiOnsiYXBwLmt1YmVybmV0ZXMuaW8vbWFuYWdlZC1ieSI6Imt1c3RvbWl6ZSIsImFwcC5rdWJlcm5ldGVzLmlvL25hbWUiOiJ3ZWJob29rLW9wZXJhdG9yIn0sIm5hbWUiOiJ3ZWJob29rLW9wZXJhdG9yLXdlYmhvb2t0ZXN0LWVkaXRvci1yb2xlIn0sInJ1bGVzIjpbeyJhcGlHcm91cHMiOlsid2ViaG9vay5vcGVyYXRvcnMuY29yZW9zLmlvIl0sInJlc291cmNlcyI6WyJ3ZWJob29rdGVzdHMiXSwidmVyYnMiOlsiY3JlYXRlIiwiZGVsZXRlIiwiZ2V0IiwibGlzdCIsInBhdGNoIiwidXBkYXRlIiwid2F0Y2giXX0seyJhcGlHcm91cHMiOlsid2ViaG9vay5vcGVyYXRvcnMuY29yZW9zLmlvIl0sInJlc291cmNlcyI6WyJ3ZWJob29rdGVzdHMvc3RhdHVzIl0sInZlcmJzIjpbImdldCJdfV19" - } - }, - { - "type": "olm.bundle.object", - "value": { - "data": "eyJhcGlWZXJzaW9uIjoicmJhYy5hdXRob3JpemF0aW9uLms4cy5pby92MSIsImtpbmQiOiJDbHVzdGVyUm9sZSIsIm1ldGFkYXRhIjp7ImNyZWF0aW9uVGltZXN0YW1wIjpudWxsLCJsYWJlbHMiOnsiYXBwLmt1YmVybmV0ZXMuaW8vbWFuYWdlZC1ieSI6Imt1c3RvbWl6ZSIsImFwcC5rdWJlcm5ldGVzLmlvL25hbWUiOiJ3ZWJob29rLW9wZXJhdG9yIn0sIm5hbWUiOiJ3ZWJob29rLW9wZXJhdG9yLXdlYmhvb2t0ZXN0LXZpZXdlci1yb2xlIn0sInJ1bGVzIjpbeyJhcGlHcm91cHMiOlsid2ViaG9vay5vcGVyYXRvcnMuY29yZW9zLmlvIl0sInJlc291cmNlcyI6WyJ3ZWJob29rdGVzdHMiXSwidmVyYnMiOlsiZ2V0IiwibGlzdCIsIndhdGNoIl19LHsiYXBpR3JvdXBzIjpbIndlYmhvb2sub3BlcmF0b3JzLmNvcmVvcy5pbyJdLCJyZXNvdXJjZXMiOlsid2ViaG9va3Rlc3RzL3N0YXR1cyJdLCJ2ZXJicyI6WyJnZXQiXX1dfQ==" - } - }, - { - "type": "olm.bundle.object", - "value": { - "data": "eyJhcGlWZXJzaW9uIjoicmJhYy5hdXRob3JpemF0aW9uLms4cy5pby92MSIsImtpbmQiOiJDbHVzdGVyUm9sZSIsIm1ldGFkYXRhIjp7ImNyZWF0aW9uVGltZXN0YW1wIjpudWxsLCJuYW1lIjoid2ViaG9vay1vcGVyYXRvci1tZXRyaWNzLXJlYWRlciJ9LCJydWxlcyI6W3sibm9uUmVzb3VyY2VVUkxzIjpbIi9tZXRyaWNzIl0sInZlcmJzIjpbImdldCJdfV19" - } - }, - { - "type": "olm.bundle.object", - "value": { - "data": "eyJhcGlWZXJzaW9uIjoidjEiLCJraW5kIjoiU2VydmljZSIsIm1ldGFkYXRhIjp7ImNyZWF0aW9uVGltZXN0YW1wIjpudWxsLCJsYWJlbHMiOnsiYXBwLmt1YmVybmV0ZXMuaW8vbWFuYWdlZC1ieSI6Imt1c3RvbWl6ZSIsImFwcC5rdWJlcm5ldGVzLmlvL25hbWUiOiJ3ZWJob29rLW9wZXJhdG9yIiwiY29udHJvbC1wbGFuZSI6ImNvbnRyb2xsZXItbWFuYWdlciJ9LCJuYW1lIjoid2ViaG9vay1vcGVyYXRvci1jb250cm9sbGVyLW1hbmFnZXItbWV0cmljcy1zZXJ2aWNlIn0sInNwZWMiOnsicG9ydHMiOlt7Im5hbWUiOiJodHRwcyIsInBvcnQiOjg0NDMsInByb3RvY29sIjoiVENQIiwidGFyZ2V0UG9ydCI6ODQ0M31dLCJzZWxlY3RvciI6eyJhcHAua3ViZXJuZXRlcy5pby9uYW1lIjoid2ViaG9vay1vcGVyYXRvciIsImNvbnRyb2wtcGxhbmUiOiJjb250cm9sbGVyLW1hbmFnZXIifX0sInN0YXR1cyI6eyJsb2FkQmFsYW5jZXIiOnt9fX0=" - } - }, - { - "type": "olm.bundle.object", - "value": { - "data": "eyJhcGlWZXJzaW9uIjoidjEiLCJraW5kIjoiU2VydmljZSIsIm1ldGFkYXRhIjp7ImNyZWF0aW9uVGltZXN0YW1wIjpudWxsLCJsYWJlbHMiOnsiYXBwLmt1YmVybmV0ZXMuaW8vbWFuYWdlZC1ieSI6Imt1c3RvbWl6ZSIsImFwcC5rdWJlcm5ldGVzLmlvL25hbWUiOiJ3ZWJob29rLW9wZXJhdG9yIn0sIm5hbWUiOiJ3ZWJob29rLW9wZXJhdG9yLXdlYmhvb2stc2VydmljZSJ9LCJzcGVjIjp7InBvcnRzIjpbeyJwb3J0Ijo0NDMsInByb3RvY29sIjoiVENQIiwidGFyZ2V0UG9ydCI6OTQ0M31dLCJzZWxlY3RvciI6eyJhcHAua3ViZXJuZXRlcy5pby9uYW1lIjoid2ViaG9vay1vcGVyYXRvciIsImNvbnRyb2wtcGxhbmUiOiJjb250cm9sbGVyLW1hbmFnZXIifX0sInN0YXR1cyI6eyJsb2FkQmFsYW5jZXIiOnt9fX0=" - } - } - ], - "relatedImages": [ - { - "name": "", - "image": "quay.io/olmtest/webhook-operator-bundle:v0.0.5" - }, - { - "name": "", - "image": "quay.io/olmtest/webhook-operator:v0.0.5" - } - ] -} diff --git a/catalog/catalog.tpl b/catalog/catalog.tpl new file mode 100644 index 0000000..be1f1a0 --- /dev/null +++ b/catalog/catalog.tpl @@ -0,0 +1,15 @@ +{ + "schema": "olm.package", + "name": "webhook-operator", + "defaultChannel": "alpha" +} +{ + "schema": "olm.channel", + "name": "alpha", + "package": "webhook-operator", + "entries": [ + { + "name": "webhook-operator.v{{ VERSION }}" + } + ] +} diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index c7d16c0..b7d7975 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization images: - name: controller newName: quay.io/olmtest/webhook-operator - newTag: v0.0.5 + newTag: v0.0.0