From 943b2acc1127362e101f7a21d5abe9bf2dd2990f Mon Sep 17 00:00:00 2001 From: Bobby Brockway Date: Mon, 3 Jun 2024 08:38:56 +0100 Subject: [PATCH 1/3] Add milvus-operator CRDs --- .github/workflows/main.yml | 41 +++++++++++++++++++++++++++++ libs/milvus-operator/config.jsonnet | 23 ++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 libs/milvus-operator/config.jsonnet diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c988c1c..26c39a7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1819,6 +1819,46 @@ "SSH_KEY": "${{ secrets.DEPLOY_KEY }}" "if": "steps.filter.outputs.workflows == 'true'" "run": "make libs/litmus-chaos" + "milvus-operator": + "name": "Generate milvus-operator Jsonnet library and docs" + "needs": + - "build" + - "repos" + "runs-on": "ubuntu-latest" + "steps": + - "uses": "actions/checkout@v3" + - "id": "filter" + "uses": "dorny/paths-filter@v2" + "with": + "filters": | + workflows: + - '.github/**' + - 'bin/**' + - 'Dockerfile' + - 'go.mod' + - 'go.sum' + - 'jsonnet/**' + - 'main.go' + - 'Makefile' + - 'pkg/**' + - 'scripts/**' + - 'tf/**' + - 'libs/milvus-operator/**' + - "if": "steps.filter.outputs.workflows == 'true'" + "uses": "actions/download-artifact@v2" + "with": + "name": "docker-artifact" + "path": "artifacts" + - "if": "steps.filter.outputs.workflows == 'true'" + "run": "make load" + - "env": + "DIFF": "true" + "GEN_COMMIT": "${{ github.ref == 'refs/heads/master' && github.repository == 'jsonnet-libs/k8s' }}" + "GIT_COMMITTER_EMAIL": "86770550+jsonnet-libs-bot@users.noreply.github.com" + "GIT_COMMITTER_NAME": "jsonnet-libs-bot" + "SSH_KEY": "${{ secrets.DEPLOY_KEY }}" + "if": "steps.filter.outputs.workflows == 'true'" + "run": "make libs/milvus-operator" "mysql-operator": "name": "Generate mysql-operator Jsonnet library and docs" "needs": @@ -2103,6 +2143,7 @@ - "kubevela" - "kyverno" - "litmus-chaos" + - "milvus-operator" - "mysql-operator" - "openshift" - "prometheus-operator" diff --git a/libs/milvus-operator/config.jsonnet b/libs/milvus-operator/config.jsonnet new file mode 100644 index 0000000..2f6313b --- /dev/null +++ b/libs/milvus-operator/config.jsonnet @@ -0,0 +1,23 @@ +// libs/milvus-operator/config.jsonnet +local config = import 'jsonnet/config.jsonnet'; + +local versions = [ + { output: '0.9', version: '0.9.15' }, +]; + +config.new( + name='milvus-operator', + specs=[ + { + crds: [ + 'https://raw.githubusercontent.com/zilliztech/milvus-operator/v%s/config/crd/bases/milvus.io_milvusclusters.yaml' % v.version, + 'https://raw.githubusercontent.com/zilliztech/milvus-operator/v%s/config/crd/bases/milvus.io_milvuses.yaml' % v.version, + 'https://raw.githubusercontent.com/zilliztech/milvus-operator/v%s/config/crd/bases/milvus.io_milvusupgrades.yaml' % v.version, + ], + localName: 'milvus-operator', + output: v.output, + prefix: '^io\\.milvus\\..*', + } + for v in versions + ] +) From 39940545d952bcbde5f7fadbcd8e7a9aff9fa280 Mon Sep 17 00:00:00 2001 From: Bobby Brockway Date: Wed, 7 Aug 2024 10:06:33 +0100 Subject: [PATCH 2/3] undo pipeline changes --- .github/workflows/main.yml | 41 -------------------------------------- 1 file changed, 41 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 26c39a7..c988c1c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1819,46 +1819,6 @@ "SSH_KEY": "${{ secrets.DEPLOY_KEY }}" "if": "steps.filter.outputs.workflows == 'true'" "run": "make libs/litmus-chaos" - "milvus-operator": - "name": "Generate milvus-operator Jsonnet library and docs" - "needs": - - "build" - - "repos" - "runs-on": "ubuntu-latest" - "steps": - - "uses": "actions/checkout@v3" - - "id": "filter" - "uses": "dorny/paths-filter@v2" - "with": - "filters": | - workflows: - - '.github/**' - - 'bin/**' - - 'Dockerfile' - - 'go.mod' - - 'go.sum' - - 'jsonnet/**' - - 'main.go' - - 'Makefile' - - 'pkg/**' - - 'scripts/**' - - 'tf/**' - - 'libs/milvus-operator/**' - - "if": "steps.filter.outputs.workflows == 'true'" - "uses": "actions/download-artifact@v2" - "with": - "name": "docker-artifact" - "path": "artifacts" - - "if": "steps.filter.outputs.workflows == 'true'" - "run": "make load" - - "env": - "DIFF": "true" - "GEN_COMMIT": "${{ github.ref == 'refs/heads/master' && github.repository == 'jsonnet-libs/k8s' }}" - "GIT_COMMITTER_EMAIL": "86770550+jsonnet-libs-bot@users.noreply.github.com" - "GIT_COMMITTER_NAME": "jsonnet-libs-bot" - "SSH_KEY": "${{ secrets.DEPLOY_KEY }}" - "if": "steps.filter.outputs.workflows == 'true'" - "run": "make libs/milvus-operator" "mysql-operator": "name": "Generate mysql-operator Jsonnet library and docs" "needs": @@ -2143,7 +2103,6 @@ - "kubevela" - "kyverno" - "litmus-chaos" - - "milvus-operator" - "mysql-operator" - "openshift" - "prometheus-operator" From 68411ef30462905988395ca729209c9b05345ede Mon Sep 17 00:00:00 2001 From: Bobby Brockway Date: Wed, 7 Aug 2024 10:08:50 +0100 Subject: [PATCH 3/3] updated ci --- .github/workflows/main.yml | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 887eb48..f21b036 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1899,6 +1899,46 @@ "SSH_KEY": "${{ secrets.DEPLOY_KEY }}" "if": "steps.filter.outputs.workflows == 'true'" "run": "make libs/litmus-chaos" + "milvus-operator": + "name": "Generate milvus-operator Jsonnet library and docs" + "needs": + - "build" + - "repos" + "runs-on": "ubuntu-latest" + "steps": + - "uses": "actions/checkout@v3" + - "id": "filter" + "uses": "dorny/paths-filter@v2" + "with": + "filters": | + workflows: + - '.github/**' + - 'bin/**' + - 'Dockerfile' + - 'go.mod' + - 'go.sum' + - 'jsonnet/**' + - 'main.go' + - 'Makefile' + - 'pkg/**' + - 'scripts/**' + - 'tf/**' + - 'libs/milvus-operator/**' + - "if": "steps.filter.outputs.workflows == 'true'" + "uses": "actions/download-artifact@v2" + "with": + "name": "docker-artifact" + "path": "artifacts" + - "if": "steps.filter.outputs.workflows == 'true'" + "run": "make load" + - "env": + "DIFF": "true" + "GEN_COMMIT": "${{ github.ref == 'refs/heads/master' && github.repository == 'jsonnet-libs/k8s' }}" + "GIT_COMMITTER_EMAIL": "86770550+jsonnet-libs-bot@users.noreply.github.com" + "GIT_COMMITTER_NAME": "jsonnet-libs-bot" + "SSH_KEY": "${{ secrets.DEPLOY_KEY }}" + "if": "steps.filter.outputs.workflows == 'true'" + "run": "make libs/milvus-operator" "minio-operator": "name": "Generate minio-operator Jsonnet library and docs" "needs": @@ -2225,6 +2265,7 @@ - "kubevela" - "kyverno" - "litmus-chaos" + - "milvus-operator" - "minio-operator" - "mysql-operator" - "openshift"