-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'operator-framework:main' into jmprusi/upgrade-edges
- Loading branch information
Showing
25 changed files
with
722 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| name: go-apidiff | ||
| on: [ pull_request ] | ||
| on: | ||
| pull_request: | ||
| merge_group: | ||
| jobs: | ||
| go-apidiff: | ||
| runs-on: ubuntu-latest | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| name: Deploy Documentation site | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| permissions: | ||
| contents: write | ||
| jobs: | ||
| deploy: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: 3.x | ||
| - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV | ||
| - uses: actions/cache@v3 | ||
| with: | ||
| key: mkdocs-material-${{ env.cache_id }} | ||
| path: .cache | ||
| restore-keys: | | ||
| mkdocs-material- | ||
| - run: pip install mkdocs-material | ||
| - run: mkdocs gh-deploy --force |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ on: | |
| pull_request: | ||
| branches: | ||
| - main | ||
| merge_group: | ||
|
|
||
| jobs: | ||
| goreleaser: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ name: sanity | |
| on: | ||
| workflow_dispatch: | ||
| pull_request: | ||
| merge_group: | ||
| push: | ||
| branches: | ||
| - main | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| # This loads a helper function that isn't part of core Tilt that simplifies restarting the process in the container | ||
| # when files changes. | ||
| load('ext://restart_process', 'docker_build_with_restart') | ||
|
|
||
| # Treat the main binary as a local resource, so we can automatically rebuild it when any of the deps change. This | ||
| # builds it locally, targeting linux, so it can run in a linux container. | ||
| local_resource( | ||
| 'manager_binary', | ||
| cmd=''' | ||
| mkdir -p .tiltbuild/bin | ||
| CGO_ENABLED=0 GOOS=linux go build -o .tiltbuild/bin/manager ./cmd/manager | ||
| ''', | ||
| deps=['api', 'cmd/manager', 'internal', 'pkg', 'go.mod', 'go.sum'] | ||
| ) | ||
|
|
||
| # Configure our image build. If the file in live_update.sync (.tiltbuild/bin/manager) changes, Tilt | ||
| # copies it to the running container and restarts it. | ||
| docker_build_with_restart( | ||
| # This has to match an image in the k8s_yaml we call below, so Tilt knows to use this image for our Deployment, | ||
| # instead of the actual image specified in the yaml. | ||
| ref='quay.io/operator-framework/operator-controller:devel', | ||
| # This is the `docker build` context, and because we're only copying in the binary we've already had Tilt build | ||
| # locally, we set the context to the directory containing the binary. | ||
| context='.tiltbuild/bin', | ||
| # We use a slimmed-down Dockerfile that only has $binary in it. | ||
| dockerfile_contents=''' | ||
| FROM gcr.io/distroless/static:debug | ||
| EXPOSE 8080 | ||
| WORKDIR / | ||
| COPY manager manager | ||
| ''', | ||
| # The set of files Tilt should include in the build. In this case, it's just the binary we built above. | ||
| only='manager', | ||
| # If .tiltbuild/bin/manager changes, Tilt will copy it into the running container and restart the process. | ||
| live_update=[ | ||
| sync('.tiltbuild/bin/manager', '/manager'), | ||
| ], | ||
| # The command to run in the container. | ||
| entrypoint="/manager", | ||
| ) | ||
|
|
||
| # Tell Tilt what to deploy by running kustomize and then doing some manipulation to make things work for Tilt. | ||
| objects = decode_yaml_stream(kustomize('config/default')) | ||
| for o in objects: | ||
| # For Tilt's live_update functionality to work, we have to run the container as root. Remove any PSA labels to allow | ||
| # this. | ||
| if o['kind'] == 'Namespace' and 'labels' in o['metadata']: | ||
| labels_to_delete = [label for label in o['metadata']['labels'] if label.startswith('pod-security.kubernetes.io')] | ||
| for label in labels_to_delete: | ||
| o['metadata']['labels'].pop(label) | ||
|
|
||
| if o['kind'] != 'Deployment': | ||
| # We only need to modify Deployments, so we can skip this | ||
| continue | ||
|
|
||
| # For Tilt's live_update functionality to work, we have to run the container as root. Otherwise, Tilt won't | ||
| # be able to untar the updated binary in the container's file system (this is how live update | ||
| # works). If there are any securityContexts, remove them. | ||
| if "securityContext" in o['spec']['template']['spec']: | ||
| o['spec']['template']['spec'].pop('securityContext') | ||
| for c in o['spec']['template']['spec']['containers']: | ||
| if "securityContext" in c: | ||
| c.pop('securityContext') | ||
|
|
||
| # Now apply all the yaml | ||
| k8s_yaml(encode_yaml_stream(objects)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| namespace: operator-controller-system | ||
|
|
||
| resources: | ||
| - ../default | ||
| - manager_e2e_coverage_pvc.yaml | ||
| - manager_e2e_coverage_copy_pod.yaml | ||
|
|
||
| patches: | ||
| - path: manager_e2e_coverage_patch.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| apiVersion: v1 | ||
| kind: Pod | ||
| metadata: | ||
| name: e2e-coverage-copy-pod | ||
| labels: | ||
| app.kubernetes.io/name: e2e-coverage-copy-pod | ||
| app.kubernetes.io/instance: controller-manager | ||
| app.kubernetes.io/component: e2e-coverage | ||
| app.kubernetes.io/created-by: operator-controller | ||
| app.kubernetes.io/part-of: operator-controller | ||
| app.kubernetes.io/managed-by: kustomize | ||
| spec: | ||
| restartPolicy: Never | ||
| securityContext: | ||
| runAsNonRoot: true | ||
| runAsUser: 65532 | ||
| seccompProfile: | ||
| type: RuntimeDefault | ||
| containers: | ||
| - name: tar | ||
| image: busybox:1.36 | ||
| command: ["sleep", "infinity"] | ||
| securityContext: | ||
| allowPrivilegeEscalation: false | ||
| capabilities: | ||
| drop: | ||
| - "ALL" | ||
| volumeMounts: | ||
| - name: e2e-coverage-volume | ||
| mountPath: /e2e-coverage | ||
| readOnly: true | ||
| volumes: | ||
| - name: e2e-coverage-volume | ||
| persistentVolumeClaim: | ||
| claimName: e2e-coverage | ||
| readOnly: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: controller-manager | ||
| namespace: system | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: kube-rbac-proxy | ||
| - name: manager | ||
| env: | ||
| - name: GOCOVERDIR | ||
| value: /e2e-coverage | ||
| volumeMounts: | ||
| - name: e2e-coverage-volume | ||
| mountPath: /e2e-coverage | ||
| volumes: | ||
| - name: e2e-coverage-volume | ||
| persistentVolumeClaim: | ||
| claimName: e2e-coverage |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| apiVersion: v1 | ||
| kind: PersistentVolumeClaim | ||
| metadata: | ||
| name: e2e-coverage | ||
| spec: | ||
| accessModes: | ||
| - ReadWriteOnce | ||
| resources: | ||
| requests: | ||
| storage: 64Mi |
Oops, something went wrong.