Automated merge

* upstream/main: (49 commits) Use upstream builder image in update-deps workflow (istio-ecosystem#399) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#398) Fix flakiness in multi-cluster tests (istio-ecosystem#400) Create GH Action for update-deps (istio-ecosystem#393) Replace `manager` with `sail-operator` for the binary name Fix the update location for the rbac proxy Add the make clean target Improve kubectl utility in e2e tests (istio-ecosystem#394) Don't add istiod-remote chart when updating latest version (istio-ecosystem#396) Make patch-csv.sh more readable Fix patch-csv.sh so that it finds hub, image, and tag in newer Istio versions Ensure Primary-Remote e2e test is also skipped for 1.24 pre-release versions Print Istio CNI logs when test fails Temporarily disable RemoteIstio tests for 1.24+ Make gen Add generics to EnqueueEventLogger and AdditionNotifierQueue Update Istio versions Remove reference to istiod-remote chart Ensure crd-all.gen.yaml file is found in newer and older Istio versions Add Helm artifacts publish automation (istio-ecosystem#385) ...
openshift-service-mesh-bot · Oct 9, 2024 · 1b9eb9c · 1b9eb9c
2 parents 64a14b8 + 845bd13
commit 1b9eb9c
Show file tree

Hide file tree

Showing 627 changed files with 15,634 additions and 4,906 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "istio build-tools",
-  "image": "gcr.io/istio-testing/build-tools:master-0aa2afb4bac9a4fd1bfe50a929c077a643066b3a",
+  "image": "gcr.io/istio-testing/build-tools:master-8eb42e9551b9a67c330aeef783f2498647d91289",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,40 @@
+ <!--  Thanks for sending a pull request!  Here are some tips for you:
+
+    1. If this is your first time, please read our contributor guidelines: https://github.com/istio-ecosystem/sail-operator/blob/main/CONTRIBUTING.md
+    2. Discuss your changes before you start working on them. You can open a new issue in the [Sail Operator GitHub repository](https://github.com/istio-ecosystem/sail-operator/issues) or start a discussion in the [Sail Operator Discussion](https://github.com/istio-ecosystem/sail-operator/discussions). By this way, you can get feedback from the community and ensure that your changes are aligned with the project goals.
+    3. If the PR is unfinished, make is as a draft.
+-->
+
+#### What type of PR is this?
+<!--
+In order to minimize the time taken to categorize your PR, add a label accoutring to the PR type defined above.
+Please, use the following labels, according to the PR type:
+    * Enhancement / New Feature - enhancement
+    * Bug Fix - bug
+    * Refactor - cleanup/refactor
+    * Optimization - enhancement
+    * Test - test-e2e
+    * Documentation Update - documentation
+-->
+
+- [ ] Enhancement / New Feature
+- [ ] Bug Fix
+- [ ] Refactor
+- [ ] Optimization
+- [ ] Test
+- [ ] Documentation Update
+
+#### What this PR does / why we need it:
+
+
+#### Which issue(s) this PR fixes:
+<!--
+*Automatically closes linked issue when PR is merged.
+Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
+Add related issue or PR if exists.
+-->
+Fixes #
+
+Related Issue/PR #
+
+#### Additional information:
diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
@@ -0,0 +1,32 @@
+name: Publish Helm artifact
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_version:
+        description: "Release version"
+        required: true
+
+run-name: Publish Helm artifact ${{ inputs.release_version }}
+
+env:
+  GIT_USER: ${{ secrets.GIT_USER }}
+  GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
+  VERSION: ${{ inputs.release_version }}
+
+jobs:
+  helm:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Publish Helm artifact to "gh-pages" branch
+        run: |
+          make helm-artifacts-publish \
+            -e GIT_CONFIG_USER_NAME="$GIT_CONFIG_USER_NAME" \
+            -e GIT_CONFIG_USER_EMAIL="$GIT_CONFIG_USER_EMAIL" \
+            -e OPERATOR_VERSION=$VERSION
+        env:
+          GIT_CONFIG_USER_NAME: "${{ github.actor }}"
+          GIT_CONFIG_USER_EMAIL: "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -0,0 +1,89 @@
+name: Release workflow
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_version:
+        description: "Release version"
+        required: true
+      bundle_channels:
+        description: "Bundle channels"
+        required: true
+        default: dev-0.2
+      is_draft_release:
+        description: "Draft release"
+        type: boolean
+        required: false
+        default: true
+      is_pre_release:
+        description: "Pre-release"
+        type: boolean
+        required: false
+        default: false
+
+run-name: Release ${{ inputs.release_version }}
+
+env:
+  GIT_USER: ${{ secrets.GIT_USER }}
+  GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
+  VERSION: ${{ inputs.release_version }}
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Login to quay.io
+      uses: docker/login-action@v3
+      with:
+        registry: quay.io
+        username: ${{ secrets.QUAY_USER }}
+        password: ${{ secrets.QUAY_PWD }}
+
+    - uses: actions/checkout@v4
+
+    - name: Build and push operator image
+      run: |
+        make docker-buildx \
+          -e TAG=$VERSION
+
+    - name: Generate bundle metadata
+      run: |
+        make bundle \
+         -e CHANNELS=$CHANNELS
+      env:
+        CHANNELS: ${{ inputs.bundle_channels }}
+
+    - name: Publish bundle in operatorhub.io
+      run: |
+        make bundle-publish \
+          -e GIT_CONFIG_USER_NAME="$GIT_CONFIG_USER_NAME" \
+          -e GIT_CONFIG_USER_EMAIL="$GIT_CONFIG_USER_EMAIL" \
+          -e OPERATOR_VERSION=$VERSION \
+          -e OPERATOR_HUB=community-operators \
+          -e OWNER=k8s-operatorhub \
+          -e FORK=maistra
+      env:
+        GIT_CONFIG_USER_NAME: "${{ github.actor }}"
+        GIT_CONFIG_USER_EMAIL: "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
+
+    - name: Publish bundle in OpenShift OperatorHub
+      run: |
+        make bundle-publish \
+          -e GIT_CONFIG_USER_NAME="$GIT_CONFIG_USER_NAME" \
+          -e GIT_CONFIG_USER_EMAIL="$GIT_CONFIG_USER_EMAIL" \
+          -e OPERATOR_VERSION=$VERSION \
+          -e OWNER=redhat-openshift-ecosystem \
+          -e FORK=maistra
+      env:
+        GIT_CONFIG_USER_NAME: "${{ github.actor }}"
+        GIT_CONFIG_USER_EMAIL: "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
+
+    - name: Create GitHub release
+      run: |
+        make create-gh-release \
+          -e GH_PRE_RELEASE=$GH_PRE_RELEASE \
+          -e GH_RELEASE_DRAFT=$GH_RELEASE_DRAFT
+      env:
+        GH_PRE_RELEASE: ${{ github.event.inputs.is_pre_release == 'true' }}
+        GH_RELEASE_DRAFT: ${{ github.event.inputs.is_draft_release == 'true' }}
diff --git a/.github/workflows/update-deps.yaml b/.github/workflows/update-deps.yaml
@@ -0,0 +1,50 @@
+name: Update-deps workflow
+
+on:
+  schedule: 
+    - cron: "0 5 * * *" # everyday at 5AM UTC
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: "Branch to update"
+        default: "main"
+        required: true
+
+run-name: update-deps
+
+env:
+  GIT_USER: ${{ secrets.GIT_USER }}
+  GH_TOKEN: ${{ secrets.GIT_TOKEN }}
+  AUTOMATOR_ORG: istio-ecosystem
+  AUTOMATOR_REPO: sail-operator
+  AUTOMATOR_BRANCH:  ${{ inputs.branch || 'main' }}
+
+jobs:
+  update-deps:
+    runs-on: ubuntu-latest
+    container:
+      image: gcr.io/istio-testing/build-tools:master-8eb42e9551b9a67c330aeef783f2498647d91289
+      options: --entrypoint ''
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        repository: istio/test-infra
+        ref: master
+
+    # this is a workaround for a permissions issue when using the istio build container
+    - run: git config --system --add safe.directory /__w/sail-operator/sail-operator
+
+    - name: Run Automator
+      run: |
+        ./tools/automator/automator.sh \
+          --org=$AUTOMATOR_ORG \
+          --repo=sail-operator \
+          --branch=$AUTOMATOR_BRANCH \
+          '--title=Automator: Update dependencies in $AUTOMATOR_ORG/$AUTOMATOR_REPO@$AUTOMATOR_BRANCH' \
+          --labels=auto-merge \
+          --email=openshiftservicemeshbot@gmail.com \
+          --modifier=update_deps \
+          --token-env \
+          --cmd='BUILD_WITH_CONTAINER=0 ./tools/update_deps.sh' \
+          --signoff
diff --git a/CODE-OF-CONDUCT.md b/CODE-OF-CONDUCT.md
@@ -0,0 +1,7 @@
+# Sail Operator Community Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+All members of the Sail Operator community must abide by the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
+Only by respecting each other can we develop a productive, collaborative community.
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -25,25 +25,15 @@ If you want to contribute to the Sail Operator project, you can follow some rule
 - Discuss your changes before you start working on them. You can open a new issue in the [Sail Operator GitHub repository](https://github.com/istio-ecosystem/sail-operator/issues) or start a discussion in the [Sail Operator Discussion](https://github.com/istio-ecosystem/sail-operator/discussions). By this way, you can get feedback from the community and ensure that your changes are aligned with the project goals.
 - Use of Labels: We use labels in the issues to help us track the progress of the issues. You can use the labels to help you understand the status of the issue and what is needed to move forward. Those labels are:
   - `backport/backport-handled`: Use this label to indicate that the issue has been backported to the appropriate branches.
-  - `testing`: Use this label to indicate that the issue is related to testing. Can be used in combination with other labels to mark the proper testing type, for example: `testing/e2e`, `testing/unit`, `testing/integration`.
+  - `test`: Use this label to indicate that the issue is related to test or add `test-needed` when a issue needs a test to be added related. Can be used in combination with other labels to mark the proper test type, for example: `test-e2e`, `test-unit`, `test-integration`.
   - `good first issue`: Use this label to indicate that the issue is a good first issue for new contributors.
   - `help wanted`: Use this label to indicate that the issue needs help from the community.
   - `enhancement`: Use this label to indicate that the issue is an enhancement related to a new feature or improvement.
-- Pull Requests: When you open a pull request, you can follow this template to help you provide the necessary information to the maintainers:
-  - **What type of PR is this?**
-  - **What this PR does / why we need it:**
-  - **Which issue(s) this PR fixes:** (Mark with Fixes #12345, with this the issue will be autoclosed when the PR is merged)
-  - **Special notes for your reviewer:**
-  - **Does this PR introduce a user-facing change?**
-  - **Additional documentation:**
-  - **Does this PR introduce a breaking change?**
-  - **Other information:**
-  - Labels: You can use the labels to help you track the status of the PR. The labels are the same as the issue labels. Additionally, you can use the `cleanup/refactor` to indicate that the PR is a cleanup or refactor of the codebase. Having the label just helps with filtering pull requests. It also is a hint that this work does not need an entry in the changelog
 
 ## Community meetings
 
 This is not defined yet. We are working on defining the community meetings and how the community can participate in them. We will update this section once we have more information.
 
 ## Security Issues
 
-If you find a security issue in the Sail Operator project, please refer to the [Security Policy](https://github.com/istio-ecosystem/sail-operator/security/policy) for more information on how to report security issues. Please do not report security issues in the public GitHub repository.
+If you find a security issue in the Sail Operator project, please refer to the [Security Policy](https://github.com/istio-ecosystem/sail-operator/security/policy) for more information on how to report security issues. Please do not report security issues in the public GitHub repository.
diff --git a/Dockerfile b/Dockerfile
@@ -2,9 +2,9 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 
 ARG TARGETOS TARGETARCH
 
-ADD out/${TARGETOS:-linux}_${TARGETARCH:-amd64}/manager /manager
+ADD out/${TARGETOS:-linux}_${TARGETARCH:-amd64}/sail-operator /sail-operator
 ADD resources /var/lib/sail-operator/resources
 
 USER 65532:65532
 WORKDIR /
-ENTRYPOINT ["/manager"]
+ENTRYPOINT ["/sail-operator"]