Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove operator - kiali-operator will now handle installation of ossmc #211

Merged
merged 1 commit into from Oct 17, 2023
Merged

remove operator - kiali-operator will now handle installation of ossmc #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 1 addition & 25 deletions .github/workflows/ci.yaml
View file
Open in desktop
Expand Up @@ -59,28 +59,4 @@ jobs:

- name: Build image
run: |
make -e CONTAINER_VERSION=$(sed -rn 's/^VERSION \?= (.*)/\1/p' Makefile) build-plugin-image

build_operator:
name: Build operator
runs-on: ubuntu-20.04
needs: [initialize]
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
ref: ${{ inputs.build_branch }}

- name: Validate OLM metadata
run: make validate

- name: Validate CR
run: |
kind create cluster
make -e CLIENT_EXE=kubectl validate-cr
kind delete cluster

- name: Build image
run: |
make -e CONTAINER_VERSION=$(sed -rn 's/^VERSION \?= (.*)/\1/p' Makefile) build-operator

make -e CONTAINER_VERSION=$(sed -rn 's/^VERSION \?= (.*)/\1/p' Makefile) build-plugin-image
26 changes: 1 addition & 25 deletions .github/workflows/nightly.yaml
View file
Open in desktop
Expand Up @@ -16,11 +16,6 @@ on:
type: string
default: quay.io/kiali/ossmconsole
required: true
operator_quay_repository:
description: Operator Quay repository
type: string
default: quay.io/kiali/ossmconsole-operator
required: true

jobs:
initialize:
Expand All @@ -40,25 +35,13 @@ jobs:
PLUGIN_QUAY_REPO="${{ github.event.inputs.plugin_quay_repository }}"
fi

if [ -z "${{ github.event.inputs.operator_quay_repository }}" ];
then
OPERATOR_QUAY_REPO="quay.io/kiali/ossmconsole-operator"
else
OPERATOR_QUAY_REPO="${{ github.event.inputs.operator_quay_repository }}"
fi

PLUGIN_QUAY_TAG="$PLUGIN_QUAY_REPO:latest"
OPERATOR_QUAY_TAG="$OPERATOR_QUAY_REPO:latest"

echo "plugin_quay_tag=$PLUGIN_QUAY_TAG" >> $GITHUB_ENV
echo "operator_quay_tag=$OPERATOR_QUAY_TAG" >> $GITHUB_ENV

- name: Log information
run: |
echo "Release type: latest"

echo "Plugin Quay tag": ${{ env.plugin_quay_tag }}
echo "Operator Quay tag": ${{ env.operator_quay_tag }}

push:
name: Push latest
Expand All @@ -67,7 +50,6 @@ jobs:
needs: [initialize]
env:
PLUGIN_QUAY_TAG: ${{ needs.initialize.outputs.plugin_quay_tag }}
OPERATOR_QUAY_TAG: ${{ needs.initialize.outputs.operator_quay_tag }}
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -78,10 +60,4 @@ jobs:
run: |
docker login -u ${{ secrets.QUAY_USER }} -p ${{ secrets.QUAY_PASSWORD }} quay.io

make -e TARGET_ARCHS="amd64 s390x ppc64le" build-push-plugin-multi-arch

- name: Build and push operator image
run: |
docker login -u ${{ secrets.QUAY_USER }} -p ${{ secrets.QUAY_PASSWORD }} quay.io

make -e TARGET_ARCHS="amd64 s390x ppc64le" build-push-operator-multi-arch
make -e TARGET_ARCHS="amd64 s390x ppc64le" build-push-plugin-multi-arch
30 changes: 0 additions & 30 deletions .github/workflows/release.yaml
View file
Open in desktop
Expand Up @@ -21,11 +21,6 @@ on:
type: string
default: quay.io/kiali/ossmconsole
required: true
operator_quay_repository:
description: Operator Quay repository
type: string
default: quay.io/kiali/ossmconsole-operator
required: true

jobs:
initialize:
Expand All @@ -39,8 +34,6 @@ jobs:
next_version: ${{ env.next_version }}
plugin_quay_tag: ${{ env.plugin_quay_tag }}
plugin_quay_repo: ${{ env.plugin_quay_repo }}
operator_quay_tag: ${{ env.operator_quay_tag }}
operator_quay_repo: ${{ env.operator_quay_repo }}
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down Expand Up @@ -159,20 +152,10 @@ jobs:
PLUGIN_QUAY_REPO="${{ github.event.inputs.plugin_quay_repository }}"
fi

if [ -z "${{ github.event.inputs.operator_quay_repository }}" ];
then
OPERATOR_QUAY_REPO="quay.io/kiali/ossmconsole-operator"
else
OPERATOR_QUAY_REPO="${{ github.event.inputs.operator_quay_repository }}"
fi

PLUGIN_QUAY_TAG="$PLUGIN_QUAY_REPO:$RELEASE_VERSION"
OPERATOR_QUAY_TAG="$OPERATOR_QUAY_REPO:$RELEASE_VERSION"

echo "plugin_quay_tag=$PLUGIN_QUAY_TAG" >> $GITHUB_ENV
echo "plugin_quay_repo=$PLUGIN_QUAY_REPO" >> $GITHUB_ENV
echo "operator_quay_tag=$OPERATOR_QUAY_TAG" >> $GITHUB_ENV
echo "operator_quay_repo=$OPERATOR_QUAY_REPO" >> $GITHUB_ENV

- name: Cleanup
run: rm bump.py minor.py
Expand All @@ -189,8 +172,6 @@ jobs:

echo "Plugin Quay tag: ${{ env.plugin_quay_tag }}"

echo "Operator Quay tag: ${{ env.operator_quay_tag }}"

release:
name: Release
if: ${{ needs.initialize.outputs.release_type != 'skip' && ((github.event_name == 'schedule' && github.repository == 'kiali/openshift-servicemesh-plugin') || github.event_name != 'schedule') }}
Expand All @@ -202,7 +183,6 @@ jobs:
NEXT_VERSION: ${{ needs.initialize.outputs.next_version }}
RELEASE_BRANCH: ${{ github.event.inputs.release_branch || github.ref_name }}
PLUGIN_QUAY_TAG: ${{ needs.initialize.outputs.plugin_quay_tag }}
OPERATOR_QUAY_TAG: ${{ needs.initialize.outputs.operator_quay_tag }}
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -225,22 +205,12 @@ jobs:

make -e TARGET_ARCHS="amd64 s390x ppc64le" build-push-plugin-multi-arch

make -e TARGET_ARCHS="amd64 s390x ppc64le" build-push-operator-multi-arch

- name: Configure git
run: |
git config user.email 'kiali-dev@googlegroups.com'

git config user.name 'kiali-bot'

- name: Create new version bundle (OLM)
run: |
make get-operator-sdk

./operator/manifests/create-new-version.sh --new-version ${RELEASE_VERSION:1} --channels candidate

git add operator/manifests/

- name: Create tag
run: |
git add Makefile
Expand Down
17 changes: 2 additions & 15 deletions Makefile
View file
Open in desktop
@@ -1,13 +1,12 @@
SHELL=/bin/bash

# Identifies the current build.
VERSION ?= v0.5.0-SNAPSHOT
# Identifies the current build. Match the same version of Kiali Server and Operator.
VERSION ?= v1.76.0-SNAPSHOT
COMMIT_HASH ?= $(shell git rev-parse HEAD)

# Directories based on the root project directory
ROOTDIR=$(CURDIR)
PLUGIN_DIR=${ROOTDIR}/plugin
OPERATOR_DIR=${ROOTDIR}/operator

# Determine if we should use Docker OR Podman - value must be one of "docker" or "podman"
DORP ?= podman
Expand All @@ -27,28 +26,16 @@ ARCH := $(shell uname -m | sed 's/x86_64/amd64/')
CONTAINER_VERSION ?= dev

include make/Makefile.plugin.mk
include make/Makefile.operator.mk
include make/Makefile.cluster.mk
include make/Makefile.olm.mk
include make/Makefile.molecule.mk

help:
@echo
@echo "Plugin targets - used to develop and build the plugin"
@sed -n 's/^##//p' make/Makefile.plugin.mk | column -t -s ':' | sed -e 's/^/ /'
@echo
@echo "Operator targets - used to develop and build the operator"
@sed -n 's/^##//p' make/Makefile.operator.mk | column -t -s ':' | sed -e 's/^/ /'
@echo
@echo "Cluster targets - used to manage images on the remote cluster"
@sed -n 's/^##//p' make/Makefile.cluster.mk | column -t -s ':' | sed -e 's/^/ /'
@echo
@echo "OLM targets - used to deploy the operator via OLM"
@sed -n 's/^##//p' make/Makefile.olm.mk | column -t -s ':' | sed -e 's/^/ /'
@echo
@echo "Molecule targets - used to run the operator molecule tests"
@sed -n 's/^##//p' make/Makefile.molecule.mk | column -t -s ':' | sed -e 's/^/ /'
@echo

.ensure-oc-exists:
@if [ ! -x "${OC}" ]; then echo "Missing 'oc'"; exit 1; fi
Expand Down