Skip to content

Commit

Permalink
Fix apache#1045: hide internal CRDs in OLM console
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolaferraro committed May 22, 2020
1 parent 91ebef7 commit b650be1
Show file tree
Hide file tree
Showing 54 changed files with 82 additions and 296 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ metadata:
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
repository: https://github.com/apache/camel-k
operators.operatorframework.io/internal-objects: '["builds.camel.apache.org","integrationkits.camel.apache.org","camelcatalogs.camel.apache.org"]'
support: Camel
name: camel-k-operator.v1.0.0-snapshot
namespace: placeholder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

channels:
- currentCSV: camel-k-operator.v1.0.0-snapshot
name: stable
- currentCSV: camel-k-operator.v1.0.0-rc2
name: alpha
defaultChannel: alpha
packageName: camel-k
defaultChannel: stable
packageName: camel-k-dev

This file was deleted.

4 changes: 2 additions & 2 deletions script/build_olm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ cd $location/..

operator-sdk generate csv --csv-version ${version} --csv-config deploy/olm-catalog/csv-config.yaml --update-crds

rm $olm_catalog/camel-k/${version}/crd-*.yaml 2>/dev/null || true
cp $location/../deploy/crd-*.yaml $olm_catalog/camel-k/${version}/
rm $olm_catalog/camel-k-dev/${version}/crd-*.yaml 2>/dev/null || true
cp $location/../deploy/crd-*.yaml $olm_catalog/camel-k-dev/${version}/
42 changes: 42 additions & 0 deletions script/olm_publish_test_bundle.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#!/bin/bash

# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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.

location=$(dirname $0)

cd $location/..

PACKAGE=camel-k-dev
VERSION=$(make get-version)

if [ -z "${QUAY_USERNAME}" ]; then
echo "Missing QUAY_USERNAME environment variable"
exit 1
fi

if [ -z "${QUAY_PASSWORD}" ]; then
echo "Missing QUAY_PASSWORD environment variable"
exit 1
fi

QUAY_ORGANIZATION=${QUAY_ORGANIZATION:-${QUAY_USERNAME}}
echo "Quay organization: $QUAY_ORGANIZATION"

echo "Publishing version: $VERSION"

export AUTH_TOKEN=$(curl -sH "Content-Type: application/json" -XPOST https://quay.io/cnr/api/v1/users/login -d '{"user": {"username": "'"${QUAY_USERNAME}"'", "password": "'"${QUAY_PASSWORD}"'"}}' | jq -r '.token')

operator-courier --verbose push deploy/olm-catalog/${PACKAGE}/ ${QUAY_ORGANIZATION} ${PACKAGE} ${VERSION} "$AUTH_TOKEN"
31 changes: 31 additions & 0 deletions script/olm_test_operator_source.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# ---------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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.
# ---------------------------------------------------------------------------

# This resource can be used to install an operator source on a OLM powered cluster
# that will display Camel K dev packages (e.g. nightly releases)

apiVersion: operators.coreos.com/v1
kind: OperatorSource
metadata:
name: camel-k-tests
namespace: openshift-marketplace
spec:
type: appregistry
endpoint: https://quay.io/cnr
registryNamespace: camelk
displayName: "Apache Nightly Operators"
publisher: "Apache"
Loading

0 comments on commit b650be1

Please sign in to comment.