Introducing OKE #534
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -17,39 +17,59 @@ jobs: | |
| build: | ||
| if: github.repository != 'micronaut-projects/micronaut-project-template' | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| OCI_CLI_USER: ${{ secrets.OCI_USER }} | ||
| OCI_CLI_TENANCY: ${{ secrets.OCI_TENANCY }} | ||
| OCI_CLI_FINGERPRINT: ${{ secrets.OCI_FINGERPRINT }} | ||
| OCI_CLI_KEY_CONTENT: ${{ secrets.OCI_KEY_FILE }} | ||
| OCI_CLI_REGION: ${{ secrets.OCI_REGION }} | ||
| strategy: | ||
| matrix: | ||
| java: [ '17' ] | ||
| graalvm: ['latest'] | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Configure Kubectl | ||
| uses: oracle-actions/[email protected] | ||
| id: test-configure-kubectl-oke-action | ||
| with: | ||
| cluster: ${{ secrets.OKE_CLUSTER_OCID }} | ||
| - name: Run Kubectl | ||
| run: kubectl get nodes -A | ||
| - name: Pre-build | ||
| uses: ./.github/actions/graalvm-pre-build | ||
| id: pre-build | ||
| env: | ||
| GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} | ||
| GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }} | ||
| GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} | ||
| GIT_COMMIT_HASH: ${{ github.sha }} | ||
| OCI_REGION: ${{ secrets.OCI_REGION }} | ||
| JOB_ID: ${{ format('{0}-graalvm-java-{1}', github.run_id, matrix.java) }} | ||
| OCI_TENANCY_NAME: ${{ secrets.OCI_TENANCY_NAME }} | ||
alvarosanchez marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| JAVA_VERSION: ${{ matrix.java }} | ||
| AUTH_TOKEN: ${{ secrets.OCI_AUTH_TOKEN }} | ||
| OCIR_USERNAME: ${{ secrets.OCIR_USERNAME }} | ||
alvarosanchez marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| with: | ||
| java: ${{ matrix.java }} | ||
| graalvm: ${{ matrix.graalvm }} | ||
| - name: Build | ||
| uses: ./.github/actions/graalvm-build | ||
| id: build | ||
| env: | ||
| GH_TOKEN_PUBLIC_REPOS_READONLY: ${{ secrets.GH_TOKEN_PUBLIC_REPOS_READONLY }} | ||
| GH_USERNAME: ${{ secrets.GH_USERNAME }} | ||
| GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} | ||
| GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }} | ||
| GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} | ||
| IMAGE_TAG: 'java-${{ matrix.java }}-${{ github.sha }}' | ||
| IMAGE_PREFIX: '${{ secrets.OCI_REGION }}.ocir.io/${{ secrets.OCI_TENANCY_NAME }}/' | ||
| KUBERNETES_TRUST_CERTIFICATES: 'true' | ||
| - name: Post-build | ||
| uses: ./.github/actions/graalvm-post-build | ||
| if: always() | ||
| id: post-build | ||
| env: | ||
| JOB_ID: ${{ format('{0}-graalvm-java-{1}', github.run_id, matrix.java) }} | ||
| with: | ||
| java: ${{ matrix.java }} | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -17,36 +17,55 @@ jobs: | |
| build: | ||
| if: github.repository != 'micronaut-projects/micronaut-project-template' | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| OCI_CLI_USER: ${{ secrets.OCI_USER }} | ||
| OCI_CLI_TENANCY: ${{ secrets.OCI_TENANCY }} | ||
| OCI_CLI_FINGERPRINT: ${{ secrets.OCI_FINGERPRINT }} | ||
| OCI_CLI_KEY_CONTENT: ${{ secrets.OCI_KEY_FILE }} | ||
| OCI_CLI_REGION: ${{ secrets.OCI_REGION }} | ||
| strategy: | ||
| matrix: | ||
| java: ['8', '11', '17'] | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Configure Kubectl | ||
| uses: oracle-actions/[email protected] | ||
| id: test-configure-kubectl-oke-action | ||
| with: | ||
| cluster: ${{ secrets.OKE_CLUSTER_OCID }} | ||
| - name: Run Kubectl | ||
| run: kubectl get nodes -A | ||
| - name: Pre-build | ||
| uses: ./.github/actions/gradle-pre-build | ||
| id: pre-build | ||
| env: | ||
| GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} | ||
| GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }} | ||
| GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} | ||
| OCI_REGION: ${{ secrets.OCI_REGION }} | ||
| OCI_TENANCY_NAME: ${{ secrets.OCI_TENANCY_NAME }} | ||
| AUTH_TOKEN: ${{ secrets.OCI_AUTH_TOKEN }} | ||
| OCIR_USERNAME: ${{ secrets.OCIR_USERNAME }} | ||
| GIT_COMMIT_HASH: ${{ github.sha }} | ||
| JOB_ID: ${{ format('{0}-java-{1}', github.run_id, matrix.java) }} | ||
| JAVA_VERSION: ${{ matrix.java }} | ||
| with: | ||
| java: ${{ matrix.java }} | ||
| - name: Build | ||
| uses: ./.github/actions/gradle-build | ||
| id: build | ||
| env: | ||
| GH_TOKEN_PUBLIC_REPOS_READONLY: ${{ secrets.GH_TOKEN_PUBLIC_REPOS_READONLY }} | ||
| GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} | ||
| GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }} | ||
| GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} | ||
| IMAGE_TAG: 'java-${{ matrix.java }}-${{ github.sha }}' | ||
| IMAGE_PREFIX: '${{ secrets.OCI_REGION }}.ocir.io/${{ secrets.OCI_TENANCY_NAME }}/' | ||
| KUBERNETES_TRUST_CERTIFICATES: 'true' | ||
| - name: Post-build | ||
| uses: ./.github/actions/gradle-post-build | ||
| id: post-build | ||
| if: always() | ||
| env: | ||
| GH_TOKEN_PUBLIC_REPOS_READONLY: ${{ secrets.GH_TOKEN_PUBLIC_REPOS_READONLY }} | ||
| GH_USERNAME: ${{ secrets.GH_USERNAME }} | ||
|
|
@@ -56,7 +75,7 @@ jobs: | |
| GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }} | ||
| GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} | ||
| GH_TOKEN: ${{ secrets.GH_TOKEN }} | ||
| JOB_ID: ${{ format('{0}-java-{1}', github.run_id, matrix.java) }} | ||
| with: | ||
| java: ${{ matrix.java }} | ||
| - name: Publish-Github-Pages | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -16,6 +16,12 @@ on: | |
| jobs: | ||
| build: | ||
| if: github.repository != 'micronaut-projects/micronaut-project-template' | ||
| env: | ||
|
There was a problem hiding this comment. FYI this workflow is being removed since we are running coverage in the main Gradle workflow. See micronaut-projects/micronaut-project-template#342 |
||
| OCI_CLI_USER: ${{ secrets.OCI_USER }} | ||
| OCI_CLI_TENANCY: ${{ secrets.OCI_TENANCY }} | ||
| OCI_CLI_FINGERPRINT: ${{ secrets.OCI_FINGERPRINT }} | ||
| OCI_CLI_KEY_CONTENT: ${{ secrets.OCI_KEY_FILE }} | ||
| OCI_CLI_REGION: ${{ secrets.OCI_REGION }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| # https://github.com/actions/virtual-environments/issues/709 | ||
|
|
@@ -39,11 +45,25 @@ jobs: | |
| with: | ||
| distribution: 'adopt' | ||
| java-version: 11 | ||
| - name: Configure Kubectl | ||
| uses: oracle-actions/[email protected] | ||
| id: test-configure-kubectl-oke-action | ||
| with: | ||
| cluster: ${{ secrets.OKE_CLUSTER_OCID }} | ||
| - name: Run Kubectl | ||
| run: kubectl get nodes -A | ||
| - name: Optional setup step | ||
| env: | ||
| GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} | ||
| GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }} | ||
| GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} | ||
| GIT_COMMIT_HASH: ${{ github.sha }} | ||
| JOB_ID: ${{ format('{0}-sonar', github.run_id) }} | ||
| OCI_REGION: ${{ secrets.OCI_REGION }} | ||
| OCI_TENANCY_NAME: ${{ secrets.OCI_TENANCY_NAME }} | ||
| JAVA_VERSION: '11' | ||
| AUTH_TOKEN: ${{ secrets.OCI_AUTH_TOKEN }} | ||
| OCIR_USERNAME: ${{ secrets.OCIR_USERNAME }} | ||
| run: | | ||
| [ -f ./setup.sh ] && ./setup.sh || true | ||
| - name: Analyse with Gradle | ||
|
|
@@ -54,5 +74,17 @@ jobs: | |
| GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} | ||
| GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }} | ||
| GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} | ||
| IMAGE_TAG: 'java-11-${{ github.sha }}' | ||
| IMAGE_PREFIX: '${{ secrets.OCI_REGION }}.ocir.io/${{ secrets.OCI_TENANCY_NAME }}/' | ||
| SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| KUBERNETES_TRUST_CERTIFICATES: 'true' | ||
| - name: Optional teardown step | ||
| if: always() | ||
| env: | ||
| GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} | ||
| GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }} | ||
| GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} | ||
| JOB_ID: ${{ format('{0}-sonar', github.run_id) }} | ||
| run: | | ||
| [ -f ./teardown.sh ] && ./teardown.sh || true | ||
This file contains hidden or 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 hidden or 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,6 @@ | ||
| package micronaut.informer | ||
|
|
||
| import groovy.util.logging.Slf4j | ||
| import io.fabric8.kubernetes.api.model.ContainerBuilder | ||
| import io.fabric8.kubernetes.api.model.ContainerPortBuilder | ||
| import io.fabric8.kubernetes.api.model.HTTPGetActionBuilder | ||
|
|
@@ -17,12 +18,15 @@ import io.kubernetes.client.openapi.models.V1Secret | |
| import io.micronaut.context.annotation.Property | ||
| import io.micronaut.context.annotation.Requires as MicronautRequires | ||
| import io.micronaut.context.env.Environment | ||
| import io.micronaut.core.util.StringUtils | ||
| import io.micronaut.http.MediaType | ||
| import io.micronaut.http.annotation.Get | ||
| import io.micronaut.http.client.annotation.Client | ||
| import io.micronaut.http.client.exceptions.HttpClientException | ||
| import io.micronaut.kubernetes.test.KubernetesSpecification | ||
| import io.micronaut.kubernetes.test.TestUtils | ||
| import io.micronaut.test.extensions.spock.annotation.MicronautTest | ||
| import jakarta.annotation.Nullable | ||
| import jakarta.inject.Inject | ||
| import spock.lang.Requires | ||
| import spock.lang.Shared | ||
|
|
@@ -35,16 +39,40 @@ import java.util.concurrent.TimeUnit | |
| @Property(name = "spec.reuseNamespace", value = "false") | ||
| @Property(name = "kubernetes.client.namespace", value = "micronaut-example-informer") | ||
| @Requires({ TestUtils.kubernetesApiAvailable() }) | ||
| @Slf4j | ||
| class SecretInformerControllerSpec extends KubernetesSpecification { | ||
|
|
||
| @Inject | ||
| @Shared | ||
| TestClient testClient | ||
|
|
||
| @Nullable | ||
| @Property(name = "image.tag") | ||
| Optional<String> imageTag | ||
|
|
||
| @Nullable | ||
| @Property(name = "image.prefix") | ||
| Optional<String> imagePrefix | ||
|
|
||
| @Override | ||
| def setupFixture(String namespace) { | ||
| createNamespaceSafe(namespace) | ||
| createBaseResources(namespace) | ||
| def imageName = "micronaut-kubernetes-informer-example" | ||
| def tagName = "latest" | ||
|
|
||
| if (StringUtils.isNotEmpty(imagePrefix.orElse(null))) { | ||
| imageName = imagePrefix.get() + imageName | ||
| } | ||
|
|
||
| if (StringUtils.isNotEmpty(imageTag.orElse(null))) { | ||
| tagName = imageTag.get() | ||
| } | ||
|
|
||
| imageName = imageName + ":" + tagName | ||
|
|
||
| log.info("Image name: ${imageName}") | ||
|
|
||
| def client = operations.getClient(namespace) | ||
| def informerDeployment = client.apps().deployments().createOrReplace( | ||
| new DeploymentBuilder() | ||
|
|
@@ -63,8 +91,8 @@ class SecretInformerControllerSpec extends KubernetesSpecification { | |
| .withSpec(new PodSpecBuilder() | ||
| .withContainers(new ContainerBuilder() | ||
| .withName("informer") | ||
| .withImage(imageName) | ||
| .withImagePullPolicy("IfNotPresent") | ||
| .withPorts(new ContainerPortBuilder() | ||
| .withName("http") | ||
| .withContainerPort(8080) | ||
|
|
@@ -113,7 +141,10 @@ class SecretInformerControllerSpec extends KubernetesSpecification { | |
|
|
||
| void "test all"() { | ||
| expect: | ||
| // kind adds "default-token" secret to every namespace. That's why we check with >= to make sure it works both with OKE and kind | ||
| testClient.all().size() >= 3 | ||
| testClient.secret("mounted-secret") | ||
| testClient.secret("another-secret") | ||
| testClient.secret("test-secret") | ||
| testClient.secret("test-secret").data.containsKey("username") | ||
| } | ||
|
|
@@ -134,7 +165,10 @@ class SecretInformerControllerSpec extends KubernetesSpecification { | |
|
|
||
| then: | ||
| conditions.eventually { | ||
| testClient.all().size() >= 4 | ||
| testClient.secret("mounted-secret") | ||
| testClient.secret("another-secret") | ||
| testClient.secret("test-secret") | ||
| testClient.secret(secretName) | ||
| } | ||
|
|
||
|
|
@@ -143,7 +177,11 @@ class SecretInformerControllerSpec extends KubernetesSpecification { | |
|
|
||
| then: | ||
| conditions.eventually { | ||
| testClient.all().size() >= 3 | ||
| testClient.secret("mounted-secret") | ||
| testClient.secret("another-secret") | ||
| testClient.secret("test-secret") | ||
| !testClient.secret(secretName) | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we change the action to use
OCI_CLI_REGIONinstead?